[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.2-7-g1ed60c6

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 1ed60c6ab41ed4f64e36136c856d2b3efe32c150
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Fri Feb 20 10:36:21 2009 +0100

    Add variable OCAML_OCAMLDOC in ocamlvars.mk to get the best ocamldoc for the architecture.

diff --git a/debian/changelog b/debian/changelog
index 38277e2..49cc0dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dh-ocaml (0.3) UNRELEASED; urgency=low
     - ocamlvars.mk: remove OCAML_IN_FILES, defined in ocamlinit.mk
 
   [ Samuel Mimram ]
+  * Add variable OCAML_OCAMLDOC in ocamlvars.mk to get the best ocamldoc for
+    the architecture.
   * Substitute everywhere in ocamlinit.
   * Add myself to uploaders.
 
@@ -14,7 +16,7 @@ dh-ocaml (0.3) UNRELEASED; urgency=low
     present and 'byte' otherwise.
   * Add myself to uploaders.
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 20 Feb 2009 09:57:54 +0100
+ -- Samuel Mimram <smimram at debian.org>  Fri, 20 Feb 2009 10:35:11 +0100
 
 dh-ocaml (0.2) experimental; urgency=low
 
diff --git a/share/ocamlvars.mk b/share/ocamlvars.mk
index 75ad992..5aecd76 100644
--- a/share/ocamlvars.mk
+++ b/share/ocamlvars.mk
@@ -72,6 +72,9 @@ OCAML_TEAM += Sven Luther <luther at debian.org>,
 OCAML_TEAM += Sylvain Le Gall <gildor at debian.org>
 # no trailing "," (comma) on the last name
 
+# Best ocamldoc for the architecture
+OCAML_OCAMLDOC ?= $(if $(OCAML_OPT_ARCH),/usr/bin/ocamldoc.opt,/usr/bin/ocamldoc)
+
 # ocamlfind flags which must be used in order to generate
 # correctly the ocamldoc documentation
 # For debian/rules writers

-- 
dh-ocaml packaging