1 diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components
2 --- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200
3 +++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200
18 diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile
19 --- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200
20 +++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200
22 include $(POCO_BASE)/build/rules/global
24 # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
25 -ODBCLIBDIR = /usr/lib
26 +ODBCLIBDIR = /usr/$(LIBDIR)
28 INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
29 -SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
30 +SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR)
32 ifeq ($(POCO_CONFIG),MinGW)
33 # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
35 # CYGWIN platform has its own ODBC library in /lib/w32api
36 SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
38 -ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
39 +ifeq (unixodbc, $(GENTOO_ODBC))
40 SYSLIBS += -lodbc -lodbcinst
41 COMMONFLAGS += -DPOCO_UNIXODBC
43 -ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
44 +ifeq (unixodbc, $(GENTOO_ODBC))
45 SYSLIBS += -lodbc -lodbcinst
46 COMMONFLAGS += -DPOCO_UNIXODBC
48 -ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
49 +ifeq (iodbc, $(GENTOO_ODBC))
50 SYSLIBS += -liodbc -liodbcinst
51 COMMONFLAGS += -DPOCO_IODBC
53 -ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
54 +ifeq (iodbc, $(GENTOO_ODBC))
55 SYSLIBS += -liodbc -liodbcinst
56 COMMONFLAGS += -DPOCO_IODBC
58 diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile
59 --- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200
60 +++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200
64 mkdir -p $(INSTALLDIR)/include/Poco
65 - mkdir -p $(INSTALLDIR)/lib
66 + mkdir -p $(INSTALLDIR)/$(LIBDIR)
67 mkdir -p $(INSTALLDIR)/bin
68 for comp in $(COMPONENTS) ; do \
69 if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
71 find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
74 - find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
75 - find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
76 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
77 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
79 -libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
80 -tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
81 +libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
82 +tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
83 samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples