pass -libdir to configure so that ocamlrun can find dlls at runtime

diff --git a/debian/changelog b/debian/changelog
index e3c74b1295650416f7b925cd8e3a4cc385dd2417..7c2dff9e084f3c7e7ba474c647378e8d3e65d5c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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

diff --git a/debian/rules b/debian/rules
index 1289d539b18932f369a900dfc7385ac8e68c2860..d0dd025ec662fa5ad588806d3cbf7e2fcbe5ca1e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -63,15 +63,15 @@ debian/$(DISTDIR).tar.bz2:
 
 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";             \