From: Stefano Zacchiroli Date: Sat, 16 Jun 2007 15:13:31 +0000 (+0000) Subject: pass -libdir to configure so that ocamlrun can find dlls at runtime X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~566 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d18770a36619ea3c0a2f0b50b6377c543416466;p=ocaml.git pass -libdir to configure so that ocamlrun can find dlls at runtime --- diff --git a/debian/changelog b/debian/changelog index e3c74b12..7c2dff9e 100644 --- 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 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 1289d539..d0dd025e 100755 --- 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"; \