[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4-1-12-g5a5cb26

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 32c3c23d2dd194399f055179c699ecbce559fc6a
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 18 22:31:51 2009 +0200

    The CDBS variable DEB_DESTDIR is bullshit when building several binary packages

diff --git a/debian/control b/debian/control
index b7576b8..3b16c01 100644
--- a/debian/control
+++ b/debian/control
@@ -51,5 +51,4 @@ Description: Checks whether dependencies of packages can be satisfied
  is possible to satisfy its dependencies and conflicts within this
  distribution. It comes in two versions:
  - edos-debcheck for debian packages
- - edos-rpmcheck for rpm packages
-
+ - edos-rpmcheck for rpm packages
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 3002ee3..82a47c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
+PKGLAB_INST = $(CURDIR)/debian/pkglab
+
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
  DEB_MAKE_BUILD_TARGET = depend pkglab.opt
 else
@@ -12,13 +14,12 @@ else
  DEB_STRIP_EXCLUDE += usr/bin/pkglab
 endif
 
-build::
+build/edos-distcheck::
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	cd distcheck && make distcheck
 else
 	cd distcheck && make distcheck.opt
 endif
 
-
 DEB_MAKE_INSTALL_TARGET = \
- install DESTDIR=$(DEB_DESTDIR)/usr MANDIR=$(DEB_DESTDIR)/usr/share/man
+ install DESTDIR=$(PKGLAB_INST)/usr MANDIR=$(PKGLAB_INST)/usr/share/man

-- 
pkglab packaging