diff -U3 -r OdbcJdbc-1.2.1.orig/Builds/Gcc.lin/makefile.linux OdbcJdbc-1.2.1/Builds/Gcc.lin/makefile.linux
--- OdbcJdbc-1.2.1.orig/Builds/Gcc.lin/makefile.linux 2004-08-21 13:11:46.000000000 -0400
+++ OdbcJdbc-1.2.1/Builds/Gcc.lin/makefile.linux 2005-11-08 11:51:36.000000000 -0500
@@ -56,7 +56,7 @@
EXTLIBDIR := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
else
INCLUDEDIR = -I/opt/firebird/include -I/usr/include/odbc
-EXTLIBDIR := -L/opt/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
+EXTLIBDIR := -L/opt/firebird/lib $(EXTLIBDIR)
endif
#
@@ -75,7 +75,7 @@
LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
#
-COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
+COMPFLAGS = -w -fPIC -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
#
#LINKFLAGS = -rdynamic -export-dynamic -shared
LINKFLAGS = -shared
@@ -143,8 +143,9 @@
@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
#
install :
- for afile in $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL); do cp $$afile /usr/lib/unixODBC; done
- ln -s /usr/lib/unixODBC/$(ISCDBC) /usr/lib/unixODBC/libIscDbc
+ /bin/install -d $(DESTDIR)/usr/lib
+ for afile in $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL); do /bin/install $$afile $(DESTDIR)/usr/lib; done
+ ln -s $(ISCDBC) $(DESTDIR)/usr/lib/IscDbc
#
uninstall :
rm /usr/lib/unixODBC/$(ISCDBC) /usr/lib/unixODBC/$(ODBCJDBC) /usr/lib/unixODBC/$(ODBCJDBCSETUP) /usr/lib/unixODBC/libIscDbc
diff -U3 -r OdbcJdbc-1.2.1.orig/Install/HtmlHelp/html/FirebirdODBC.htm OdbcJdbc-1.2.1/Install/HtmlHelp/html/FirebirdODBC.htm
--- OdbcJdbc-1.2.1.orig/Install/HtmlHelp/html/FirebirdODBC.htm 2004-08-12 12:20:52.000000000 -0400
+++ OdbcJdbc-1.2.1/Install/HtmlHelp/html/FirebirdODBC.htm 2005-11-08 12:06:46.000000000 -0500
@@ -28,7 +28,7 @@
-
+
Firebird ODBC Configuration Parameters
diff -U3 -r OdbcJdbc-1.2.1.orig/OdbcInstGetProp.cpp OdbcJdbc-1.2.1/OdbcInstGetProp.cpp
--- OdbcJdbc-1.2.1.orig/OdbcInstGetProp.cpp 2004-06-23 17:49:34.000000000 -0400
+++ OdbcJdbc-1.2.1/OdbcInstGetProp.cpp 2005-11-08 11:18:09.000000000 -0500
@@ -1,9 +1,14 @@
#ifndef _WIN32
+#include
+#include
#include
#include "SetupAttributes.h"
+#define TRUE 1
+#define FALSE 0
+
static const char *charsets []=
{
"NONE", "ASCII", "BIG_5", "CYRL", "DOS437", "DOS850", "DOS852", "DOS857", "DOS860",