[Pkg-ocaml-maint-commits] r4195 - in /trunk/packages/ocaml/trunk/debian/cdbs: ocaml-vars.mk ocaml.mk

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Aug 27 08:58:20 2007
New Revision: 4195

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4195
Log:
- more consistent variable naming for OCAML_LIB*_PACKAGES variables
- install HTML API doc generated by ocamldoc under /usr/share/doc/PACKAGE/html/api/
- bump sample API version to 3.10.0

Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=4195&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Mon Aug 27 08:58:20 2007
@@ -25,7 +25,7 @@
 ifndef _cdbs_class_ocaml_vars
 _cdbs_class_ocaml_vars = 1
 
-# current OCaml ABI version (e.g. 3.09.2).
+# current OCaml ABI version (e.g. 3.10.0).
 # Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
 # below), may be useful to debian/rules writers as well
 OCAML_ABI := $(shell /usr/bin/ocamlc -version)
@@ -71,18 +71,22 @@
 # no trailing "," (comma) on the last name
 
 # space separated list of packages matching the naming convention for OCaml
-# libraries, i.e. libXXX-ocaml-dev.
+# development libraries, i.e. libXXX-ocaml-dev.
 # For debian/rules writers
-OCAML_DEV_PACKAGES := $(filter lib%-ocaml-dev,$(DEB_PACKAGES))
+OCAML_LIBDEV_PACKAGES := $(filter lib%-ocaml-dev,$(DEB_PACKAGES))
+
+# as above, but keep packages matching the convention for OCaml runtime
+# libraries, i.e. libXX-ocaml
+OCAML_LIB_PACKAGES := $(filter lib%-ocaml,$(DEB_PACKAGES))
 
 # space separated list of packages on which ocamldoc usage is required. For
 # each package listed here will have ocamldoc invoked on all *.ml/*.mli files
 # installed under $(OCAML_STDLIB_DIR) to generated html documentation which
 # will be shipped in /usr/share/doc/PACKAGE/html/*.
-# Typical usage is OCAML_OCAMLDOC_PACKAGES = $(OCAML_DEV_PACKAGES).
+# Typical usage is OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES).
 # For debian/rules writers
 OCAML_OCAMLDOC_PACKAGES =
-#OCAML_OCAMLDOC_PACKAGES = $(OCAML_DEV_PACKAGES)	# more "aggressive" default
+#OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)	# more "aggressive" default
 
 # flags to be passed to ocamldoc (in addition to -html and -d DESTDIR).
 # For debian/rules writers

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=4195&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Mon Aug 27 08:58:20 2007
@@ -45,13 +45,13 @@
 # post-install hooks for invoking ocamldoc on OCAML_OCAMLDOC_PACKAGES packages
 $(patsubst %,install/%,$(DEB_PACKAGES))::
 	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \
-		echo 'mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html' ; \
-		mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html ; \
+		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)/ ...' ; \
 		find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
 			-type f -name '*.mli' -or -name '*.ml' \
 		| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) -html \
-			-d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html ; \
+			-d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
 	fi
 
 # generate .in files counterpars before building, substituting @OCamlABI@