[Pkg-ocaml-maint-commits] r3850 - in /trunk/packages/ocaml/trunk/debian: changelog rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sat Jun 16 15:13:31 2007
New Revision: 3850

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3850
Log:
pass -libdir to configure so that ocamlrun can find dlls at runtime

Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=3850&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sat Jun 16 15:13:31 2007
@@ -1,3 +1,12 @@
+ocaml (3.10.0-3) UNRELEASED; urgency=low
+
+  * debian/rules
+    - pass -libdir to configure (now that it is supported upstream) in
+      addition to sed-ing generated config Makefiles; otherwise ocamlrun won't
+      get the correct libdir setting
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 16 Jun 2007 15:48:10 +0100
+
 ocaml (3.10.0-2) experimental; urgency=low
 
   * Split two new packages: "camlp4" and "camlp4-extra" to cope with the huge

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=3850&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sat Jun 16 15:13:31 2007
@@ -63,15 +63,15 @@
 
 config-stamp: pre-config patch-stamp abi-sed
 	dh_testdir
-	# Add here commands to configure the package.
 	./configure --with-pthread -prefix /usr				\
+		-libdir /usr/lib/ocaml/$(OCAMLABI)			\
 		-mandir /usr/share/man					\
 		-tkdefs "-I/usr/include/tcl8.4"				\
 		-tklibs "-L/usr/lib -ltk8.4 -ltcl8.4"
-	sed -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g"      	\
-	    -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)%g" \
-	    -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)/stublibs%g" \
-		config/Makefile >config/Makefile.debian
+	sed -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g"           			\
+	    -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)%g"			\
+	    -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)/stublibs%g"	\
+		config/Makefile > config/Makefile.debian
 	mv config/Makefile.debian config/Makefile
 	if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then\
 		echo "Error, labltk library was not built";		\