[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-42-g1b9df77

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 1b9df775bc804c2ffb31ba15e18cdc8922e3e46c
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Nov 13 11:37:01 2009 +0100

    new patch: ensure make create DESTDIR upon install

diff --git a/debian/changelog b/debian/changelog
index 9691fca..e0d3e5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ janest-core (0.6.0-1) unstable; urgency=low
     - 0002-extra-targets-to-enable-compilation-of-byte-code-onl
     - 0003-add-missing-META-dep-on-unix
     - 0004-fix-build-on-kfreebsd
+    - 0005-create-destdir-upon-install (new patch: ensure make mkdir dest)
   * debian/control:
     - add (new) build-dep on libfields-camlp4-dev
     - split 3 new binary packages:
diff --git a/debian/patches/0005-create-destdir-upon-install.patch b/debian/patches/0005-create-destdir-upon-install.patch
new file mode 100644
index 0000000..88409cd
--- /dev/null
+++ b/debian/patches/0005-create-destdir-upon-install.patch
@@ -0,0 +1,29 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Fri, 13 Nov 2009 11:34:03 +0100
+Subject: [PATCH] create destdir upon install
+
+---
+ Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 746dca2..f3af42b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,6 +5,7 @@ all:
+ 
+ .PHONY:	install
+ install:
++	if [ -n "$(DESTDIR)" ] ; then mkdir -p "$(DESTDIR)" ; fi
+ 	@cd lib && $(MAKE) $@
+ 	@cd extended && $(MAKE) $@
+ 
+@@ -26,6 +27,7 @@ byte:
+ 
+ .PHONY:	libinstall-byte-code
+ libinstall-byte-code:
++	if [ -n "$(DESTDIR)" ] ; then mkdir -p "$(DESTDIR)" ; fi
+ 	@cd lib && $(MAKE) $@
+ 	@cd extended && $(MAKE) $@
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4af7fbd..96418b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-make-targets-to-enable-bytecode-only-compilation.patch
 0003-add-missing-META-dep-on-unix.patch
 0004-fix-build-on-kfreebsd.patch
+0005-create-destdir-upon-install.patch
diff --git a/debian/rules b/debian/rules
index 6510fbe..c77daad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,10 @@ PP_FILES = \
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
 else
 DEB_MAKE_BUILD_TARGET = byte
-DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
+DEB_MAKE_INSTALL_TARGET = libinstall-byte-code DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
 endif
 
 # pre-process files that need so, before feeding them to ocamldoc

-- 
janest-core packaging