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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 648f632292aefe35f3cc7b7eb0291ba2636fd020
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 25 08:57:27 2009 +0200

    install distcehck

diff --git a/debian/changelog b/debian/changelog
index d0e04fb..0fb2ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ pkglab (1.4.1-1) unstable; urgency=low
   * New upstream version.
   * debian/rules: put explicit MANDIR in install target
   * Create edos-distchck package
+  * Build and install pkglab documentation
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 18 May 2009 21:55:53 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 25 May 2009 08:55:30 +0200
 
 pkglab (1.4-2) unstable; urgency=low
 
diff --git a/debian/edos-distcheck.dirs b/debian/edos-distcheck.dirs
index a65408f..7b9b0e0 100644
--- a/debian/edos-distcheck.dirs
+++ b/debian/edos-distcheck.dirs
@@ -1,2 +1,3 @@
 usr/bin
+usr/lib/edos-distcheck
 usr/share/man
diff --git a/debian/rules b/debian/rules
index a4b2ad1..9572a05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ else
  DEB_STRIP_EXCLUDE += usr/bin/pkglab
 endif
 
+build/pkglab::
+	cd doc && make pkglab.html
+
 build/edos-distcheck::
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	cd distcheck && make distcheck
@@ -23,7 +26,11 @@ else
 endif
 
 install/edos-distcheck::
-	cd distcheck && make install BINDIR=$(DISTCHECK_INST)/usr/bin
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	cp distcheck/distcheck.opt $(DISTCHECK_INST)/usr/lib/edos-distcheck/distcheck
+else
+	cp distcheck/distcheck $(DISTCHECK_INST)/usr/lib/edos-distcheck/distcheck
+endif
 
 DEB_MAKE_INSTALL_TARGET = \
  install DESTDIR=$(PKGLAB_INST)/usr MANDIR=$(PKGLAB_INST)/usr/share/man

-- 
pkglab packaging