[Pkg-ocaml-maint-commits] [SCM] pxp packaging branch, master, updated. debian/1.2.0.test1-3-26-g060dc7f

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit c5ab323ffae46126f930b2bf92880a89391c50bf
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 17:50:55 2009 +0100

    create destdir at the end of the build

diff --git a/debian/changelog b/debian/changelog
index 8e2b67d..d502e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,9 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
     - bump Standards-Version to 3.8.1 (no changes)
     - move pxp to (new) archive section "ocaml"
   * debian/docs: avoid installing vanished documents
-  * debian/rules: use ocaml.mk as a CDBS "rules" snippet
+  * debian/rules:
+    - use ocaml.mk as a CDBS "rules" snippet
+    - create destdir at the end of the build
   * use upstream build system to create the ocamldoc reference manual,
     because it includes extra documentation
 
diff --git a/debian/rules b/debian/rules
index c4a8b2c..cc9c335 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpxp-ocaml-dev
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
+DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 
 configure/$(PKGNAME)::
 	./configure -without-wlex -without-wlex-compat
@@ -16,6 +17,7 @@ build/$(PKGNAME)::
 endif
 build/$(PKGNAME)::
 	$(MAKE) -C doc/manual/
+	mkdir -p $(DESTDIR)
 binary-post-install/$(PKGNAME)::
 	-for f in debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/* ; do \
 		test ! -r $$f && rm -f $$f ; \

-- 
pxp packaging