1 diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components
2 --- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200
3 +++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200
17 diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile
18 --- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200
19 +++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200
21 ifeq ($(POCO_CONFIG),MinGW)
22 # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
24 -ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
25 +ifeq (unixodbc, $(GENTOO_ODBC))
26 SYSLIBS += -lodbc -lodbcinst
27 COMMONFLAGS += -DPOCO_UNIXODBC
29 -ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
30 +ifeq (unixodbc, $(GENTOO_ODBC))
31 SYSLIBS += -lodbc -lodbcinst
32 COMMONFLAGS += -DPOCO_UNIXODBC
34 -ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
35 +ifeq (iodbc, $(GENTOO_ODBC))
36 SYSLIBS += -liodbc -liodbcinst
37 COMMONFLAGS += -DPOCO_IODBC
39 -ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
40 +ifeq (iodbc, $(GENTOO_ODBC))
41 SYSLIBS += -liodbc -liodbcinst
42 COMMONFLAGS += -DPOCO_IODBC
44 diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile
45 --- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200
46 +++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200
49 .PHONY: all libexecs cppunit tests samples clean distclean install
51 -all: libexecs tests samples
54 INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
55 COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip
59 mkdir -p $(INSTALLDIR)/include/Poco
60 - mkdir -p $(INSTALLDIR)/lib
61 + mkdir -p $(INSTALLDIR)/$(LIBDIR)
62 mkdir -p $(INSTALLDIR)/bin
63 for comp in $(COMPONENTS) ; do \
64 if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
66 find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
69 - find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
70 - find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
71 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
72 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
74 -libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Crypto-libexec Zip-libexec
75 -tests = Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Crypto-tests Zip-tests
76 +libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec
77 +tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
78 samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples