From: Stefano Zacchiroli <zack@debian.org>
Date: Fri, 31 Aug 2007 09:56:32 +0000 (+0000)
Subject: bugfixes: use the proper dir when mkdir-ing, ignore ocamldoc errors
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~537
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb309b49614a43404efb29e16909aa41d8e12aae;p=ocaml.git

bugfixes: use the proper dir when mkdir-ing, ignore ocamldoc errors
---

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index bc92da1b..0dabfa09 100644
--- 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 4236 2007-08-31 09:45:13Z zack $
+# $Id: ocaml.mk 4238 2007-08-31 09:56:32Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -45,14 +45,15 @@ endif
 # 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@