[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 3bc1d3f606a885975312a67ad411696b14763193

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 8429f5b0bbff89eaa0a502449146204bd9d05b44
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Jun 2 15:35:03 2008 +0200

    bugfix: pass INSTALLDIR=... to cmi-install

diff --git a/Makefile.config.in b/Makefile.config.in
index 82cc21c..698cf95 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -57,9 +57,9 @@ ifdef C_SOURCES
 endif
 
 cmi-install:
-	install -m 644 $(CMIS) $(DESTDIR)/$(INSTALLDIR)
+	install -m 644 $(CMIS) $(INSTALLDIR)
 
 extra-install:
 ifdef EXTRA_INSTALL
-	install $(EXTRA_INSTALL) $(DESTDIR)/$(INSTALLDIR)
+	install $(EXTRA_INSTALL) $(INSTALLDIR)
 endif
diff --git a/Makefile.in b/Makefile.in
index 6cbcadb..125b340 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,5 +57,5 @@ else
 	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
 endif	
 	@for i in $(DIRS); do \
-		$(MAKE) -C $$i cmi-install extra-install DESTDIR=$(DESTDIR); \
+		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR); \
 	done

-- 
dose2 packaging