ocamlodbc (2.15-5) makefiles

#! /bin/sh /usr/share/dpatch/dpatch-run
## makefiles.dpatch by John Goerzen <jgoerzen@complete.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cleaner Makefiles.

@DPATCH@
diff -urNad ocamlodbc-2.15~/Biniki/Makefile ocamlodbc-2.15/Biniki/Makefile
--- ocamlodbc-2.15~/Biniki/Makefile	2007-07-19 11:04:46.000000000 +0200
+++ ocamlodbc-2.15/Biniki/Makefile	2007-07-19 11:04:58.000000000 +0200
@@ -13,11 +13,16 @@
 # Overriden flags
 
 COMPFLAGS=-nolabels -I ../$(SUBDIR) $(INCLUDEGTK)
-LINKFLAGS=-ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK)
+LINKFLAGS=-ccopt -fPIC -ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK)
 
 ####
 BINIKI=biniki
-BINIKI_OPT=biniki.opt
+
+ifeq ($(OCAMLOPT),no)
+  BINIKI_OPT=
+else
+  BINIKI_OPT=biniki.opt
+endif
 
 # targets for each database
 mysql:
diff -urNad ocamlodbc-2.15~/Makefile ocamlodbc-2.15/Makefile
--- ocamlodbc-2.15~/Makefile	2007-07-19 11:04:46.000000000 +0200
+++ ocamlodbc-2.15/Makefile	2007-07-19 11:05:54.000000000 +0200
@@ -88,7 +88,7 @@
 	$(AR) $@ $(OBJFILES)
 	$(RANLIB) $@
 
-$(LIB): $(OBJOCAML) $(LIBOBJ)
+$(LIB): $(OBJOCAML) $(LIBOBJ) $(LIB_C)
 	$(OCAMLC) -a -linkall -custom -o $@ -cclib -locamlodbc \
 		$(LINKFLAGS) $(OBJOCAML) $(LIBOBJ)
 $(LIB_OPT): $(OBJOCAML_OPT) $(LIBOBJ_OPT) $(LIB_C)
@@ -160,10 +160,10 @@
 	@echo '  To install directly type : "make direct_install"'
 
 direct_install: dummy
-	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
-	if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
+	if test -d $(DESTDIR)/$(INSTALL_BINDIR); then : ; else $(MKDIR) $(DESTDIR)/$(INSTALL_BINDIR); fi
+	if test -d $(DESTDIR)/$(INSTALL_LIBDIR); then : ; else $(MKDIR) $(DESTDIR)/$(INSTALL_LIBDIR); fi
 	for i in mysql postgres db2 unixodbc openingres oraclecfo ; \
-	do (if test -d $$i ; then ($(MKDIR) $(INSTALL_LIBDIR)/$$i ; $(CP) $$i/* $(INSTALL_LIBDIR)/$$i/) fi) ; done
+	do (if test -d $$i ; then ($(MKDIR) $(DESTDIR)/$(INSTALL_LIBDIR)/$$i ; $(CP) $$i/* $(DESTDIR)/$(INSTALL_LIBDIR)/$$i/) fi) ; done
 
 findlib_install: META dummy
 	for i in mysql postgres db2 unixodbc openingres oraclecfo ; do \
diff -urNad ocamlodbc-2.15~/master.Makefile.in ocamlodbc-2.15/master.Makefile.in
--- ocamlodbc-2.15~/master.Makefile.in	2007-07-19 11:04:46.000000000 +0200
+++ ocamlodbc-2.15/master.Makefile.in	2007-07-19 11:06:57.000000000 +0200
@@ -42,8 +42,13 @@
 MKDIR=mkdir -p
 CP=cp -f
 LIB=ocamlodbc.cma
-LIB_OPT=$(LIB:.cma=.cmxa)
-LIB_A=ocamlodbc.a
+ifeq ($(OCAMLOPT),no)
+  LIB_OPT=
+  LIB_A=
+else
+  LIB_OPT=$(LIB:.cma=.cmxa)
+  LIB_A=ocamlodbc.a
+endif
 LIB_C=libocamlodbc.a
 LIB_CMI=$(LIB:.cma=.cmi)
 INSTALL_LIBDIR=$(OCAMLLIB)/ocamlodbc
@@ -116,7 +121,7 @@
 
 # Options for compilation and link
 CC       = gcc
-C_COMPFLAGS= -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB)
+C_COMPFLAGS= -fPIC -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB)
 
 #MYSQL_C_LINKFLAGS= -L$(ODBCLIB) -L$(ODBCLIB)/mysql
 #POSTGRES_C_LINKFLAGS=-L$(ODBCLIB)