* fix the cdbs class to pass -I flags down to ocamldoc

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index df434bf15aac2114d81795380b827b80e5179ccb..20673b8efaf9588121cf028b4a75181152fe4a9d 100644 (file)
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml.mk 4643 2007-10-18 00:21:51Z gildor $
+# $Id: ocaml.mk 4944 2007-12-28 14:50:46Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -61,7 +61,8 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
                echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \
                find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
                        -type f -name '*.mli' -or -name '*.ml' \
-               | xargs $$OCAMLDOC -html $(OCAML_OCAMLDOC_FLAGS_HTML) \
+               | xargs $$OCAMLDOC $$OCAML_OCAMLDOC_INCLUDE \
+                       -html $(OCAML_OCAMLDOC_FLAGS_HTML) \
                        -d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
                || true ; \
        fi

diff --git a/debian/changelog b/debian/changelog
index 8f51be119a06f089e2ec5e4a17d950867383da26..a1e7266882e2c78b5aac3a7a57c1597ad4c535c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (3.10.0-13) unstable; urgency=low
+
+  [ Stefano Zacchiroli ]
+  * fix the cdbs class to pass -I flags down to ocamldoc
+
+ -- Stefano Zacchiroli <zack@debian.org>  Fri, 28 Dec 2007 15:48:54 +0100
+
 ocaml (3.10.0-12) unstable; urgency=low
 
   [ Julien Cristau ]