[Pkg-ocaml-maint-commits] [SCM] ocamlviz packaging branch, master, updated. debian/1.01-1-3-g16676c8

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 16676c8b64fe1058e069962e913a09174eb19bfc
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Apr 9 06:03:09 2010 +0200

    Conditionally compile documentation in override_dh_auto_install

diff --git a/debian/changelog b/debian/changelog
index fd45750..96fe4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 ocamlviz (1.01-2) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * NOT RELEASED
   * The gui should depend on graphviz on runtime.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 25 Mar 2010 16:02:06 +0100
+  [ Stéphane Glondu ]
+  * Conditionally compile documentation in override_dh_auto_install
+    (Closes: #576986)
+
+ -- Stéphane Glondu <glondu at debian.org>  Fri, 09 Apr 2010 05:59:55 +0200
 
 ocamlviz (1.01-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 17443dd..61dc53f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,13 +20,13 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 	$(MAKE)
+
+override_dh_auto_install:
 ifneq (,$(findstring libocamlviz-ocaml-doc,$(shell dh_listpackages)))
 	$(MAKE) doc/manual.pdf
 	cd doc && pdflatex manual.tex
 	cd doc && pdflatex manual.tex
 endif
-
-override_dh_auto_install:
 	mkdir -p $(OVBINDIR)
 	mkdir -p $(OVLIBDIR)/camlp4
 	$(MAKE) OCAMLLIB=$(OVLIBDIR) BINDIR=$(OVBINDIR) install

-- 
ocamlviz packaging