[Pkg-ocaml-maint-commits] r1146 - packages/ocamlodbc/trunk/debian/patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-03-30 22:58:59 +0000 (Wed, 30 Mar 2005)
New Revision: 1146

Added:
   packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
Log:
I had forgotten to add this file in the repo.

Added: packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
===================================================================
--- packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-03-30 22:54:02 UTC (rev 1145)
+++ packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-03-30 22:58:59 UTC (rev 1146)
@@ -0,0 +1,74 @@
+#! /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.8/Biniki/Makefile /tmp/dpep.cIZsCL/ocamlodbc-2.8/Biniki/Makefile
+--- ocamlodbc-2.8/Biniki/Makefile	2004-07-27 17:09:24.000000000 +0200
++++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/Biniki/Makefile	2005-03-28 22:22:07.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.8/Makefile /tmp/dpep.cIZsCL/ocamlodbc-2.8/Makefile
+--- ocamlodbc-2.8/Makefile	2004-07-27 17:09:24.000000000 +0200
++++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/Makefile	2005-03-28 22:22:07.000000000 +0200
+@@ -136,10 +136,10 @@
+ # installation :
+ ################
+ 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
+ 
+ # common rules
+ .depend depend::
+diff -urNad ocamlodbc-2.8/master.Makefile.in /tmp/dpep.cIZsCL/ocamlodbc-2.8/master.Makefile.in
+--- ocamlodbc-2.8/master.Makefile.in	2004-07-27 17:09:24.000000000 +0200
++++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/master.Makefile.in	2005-03-28 22:22:07.000000000 +0200
+@@ -41,8 +41,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
+@@ -114,7 +119,7 @@
+ 
+ # Options for compilation and link
+ CC       = gcc
+-C_COMPFLAGS= -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) -I $(OCAMLLIB)/caml
++C_COMPFLAGS= -fPIC -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) -I $(OCAMLLIB)/caml
+ 
+ #MYSQL_C_LINKFLAGS= -L$(ODBCLIB) -L$(ODBCLIB)/mysql
+ #POSTGRES_C_LINKFLAGS=-L$(ODBCLIB)


Property changes on: packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
___________________________________________________________________
Name: svn:executable
   + *