[Pkg-ocaml-maint-commits] r862 - packages/equeue/trunk/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2004-12-09 11:51:55 -0700 (Thu, 09 Dec 2004)
New Revision: 862

Modified:
   packages/equeue/trunk/debian/rules
Log:
OCAMLFIND_LDCONF=ignore instead of dummy.

Modified: packages/equeue/trunk/debian/rules
===================================================================
--- packages/equeue/trunk/debian/rules	2004-12-09 14:33:20 UTC (rev 861)
+++ packages/equeue/trunk/debian/rules	2004-12-09 18:51:55 UTC (rev 862)
@@ -6,8 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-TARGETDIR = $(CURDIR)/debian/tmp
-OCAML_LIB_DIR = $(shell ocamlc -where)
+TMPDIR = $(CURDIR)/debian/tmp
+DESTDIR = $(TMPDIR)/$(shell ocamlc -where)
 
 config.status: configure
 	dh_testdir
@@ -37,9 +37,8 @@
 	dh_clean -k 
 	dh_installdirs
 
-	mkdir -p $(TARGETDIR)$(OCAML_LIB_DIR)
-	$(MAKE) install OCAMLFIND_DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR) \
-	 OCAMLFIND_LDCONF=dummy
+	mkdir -p $(DESTDIR)
+	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 	dh_install --sourcedir=debian/tmp
 	mv debian/libequeue-ocaml-dev/usr/lib/ocaml/3.08/METAS/META debian/libequeue-ocaml-dev/usr/lib/ocaml/3.08/METAS/META.equeue
 	echo 'directory = "+equeue-core"' >> debian/libequeue-ocaml-dev/usr/lib/ocaml/3.08/METAS/META.equeue