* CDBS class

  - add support for specifying the target dir for generated documentation

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index e984b2f2f78847ac43de3fa7eda4abe7c9ac01bb..89f15cc8089c4562a66b8ea0a657983c580c82cf 100644 (file)
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.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-vars.mk 4200 2007-08-27 13:18:18Z zack $
+# $Id: ocaml-vars.mk 4236 2007-08-31 09:45:13Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -100,5 +100,11 @@ OCAML_OCAMLDOC_FLAGS_HTML =
 # For debian/rules writers
 OCAML_OCAMLDOC_FLAGS_MAN = -man-mini
 
+# where to install HTML version of the ocamldoc generated API reference. You
+# can use "$(cdbs_curpkg)" stem there, it will be expanded to the current
+# package name by CDBS
+# For debian/rules writers
+OCAML_OCAMLDOC_DESTDIR_HTML = usr/share/doc/$(cdbs_curpkg)/html/api
+
 endif
 

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 16d66614898fef27eb73fead0a8622d5ebdcd78c..bc92da1b4b048ad206cd650c1e9703c905f2f34c 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 4200 2007-08-27 13:18:18Z zack $
+# $Id: ocaml.mk 4236 2007-08-31 09:45:13Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -48,19 +48,11 @@ $(patsubst %,install/%,$(DEB_PACKAGES))::
                echo 'mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api' ; \
                mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
                echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \
-               # generate HTML documentation
                find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
                        -type f -name '*.mli' -or -name '*.ml' \
                | xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) \
                        -html $(OCAML_OCAMLDOC_FLAGS_HTML) \
-                       -d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
-               ## generate manpages
-               ## XXX dumb: find for *.ml{i,} is executed twice
-               #find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
-               #       -type f -name '*.mli' -or -name '*.ml' \
-               #| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) \
-               #       -man $(OCAML_OCAMLDOC_FLAGS_MAN) \
-               #       -d debian/$(cdbs_curpkg)/usr/share/man/... # TODO ; \
+                       -d $(OCAML_OCAMLDOC_DESTDIR_HTML) ; \
        fi
 
 # generate .in files counterpars before building, substituting @OCamlABI@

diff --git a/debian/changelog b/debian/changelog
index 895e6e90611831679de252a107b59e4cf2598071..48ff738fae4c275fffad36065c9b15c9e251d681 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ ocaml (3.10.0-7) UNRELEASED; urgency=low
     bug 4375
   * don't ignore make clean error
 
- -- Sylvain Le Gall <gildor@debian.org>  Fri, 31 Aug 2007 01:27:19 +0200
+  [ Stefano Zacchiroli ]
+  * CDBS class
+    - add support for specifying the target dir for generated documentation
+
+ -- Stefano Zacchiroli <zack@debian.org>  Fri, 31 Aug 2007 11:23:46 +0200
 
 ocaml (3.10.0-6) unstable; urgency=low