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

[zack at users.alioth.debian.org]

Author: zack
Date: Fri Aug 31 09:45:13 2007
New Revision: 4236

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4236
Log:
* CDBS class
  - add support for specifying the target dir for generated documentation

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

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=4236&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Fri Aug 31 09:45:13 2007
@@ -100,5 +100,11 @@
 # 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
 

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=4236&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Fri Aug 31 09:45:13 2007
@@ -48,19 +48,11 @@
 		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@

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4236&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Fri Aug 31 09:45:13 2007
@@ -5,7 +5,11 @@
     bug 4375
   * don't ignore make clean error
 
- -- Sylvain Le Gall <gildor at 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 at debian.org>  Fri, 31 Aug 2007 11:23:46 +0200
 
 ocaml (3.10.0-6) unstable; urgency=low