[Pkg-ocaml-maint-commits] r4238 - /trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk

[zack at users.alioth.debian.org]

Author: zack
Date: Fri Aug 31 09:56:32 2007
New Revision: 4238

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4238
Log:
bugfixes: use the proper dir when mkdir-ing, ignore ocamldoc errors

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

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=4238&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Fri Aug 31 09:56:32 2007
@@ -45,14 +45,15 @@
 # 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/api' ; \
-		mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
+		echo 'mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML)' ; \
+		mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) ; \
 		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 $(OCAML_OCAMLDOC_FLAGS_HTML) \
-			-d $(OCAML_OCAMLDOC_DESTDIR_HTML) ; \
+			-d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
+		|| true ; \
 	fi
 
 # generate .in files counterpars before building, substituting @OCamlABI@