[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-4-2-gda7c45f

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit da7c45f8355695b7043e9f346e1a8d2c090d5e95
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 18:14:38 2009 +0100

    invoke ocamldoc-api-ref-config from /usr/share/ocaml (moved there)

diff --git a/debian/changelog b/debian/changelog
index 0efd7e0..79d0d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ galax (1.1-5) UNRELEASED; urgency=low
     - add build-dependency on dh-ocaml, which ships the CDBS class
     - make consistent the indentation of dependency fields
   * debian/rules
+    - invoke ocamldoc-api-ref-config from /usr/share/ocaml (moved there)
     - use ocaml.mk class as a "rules" file, as now is
 
  -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Feb 2009 18:08:40 +0100
diff --git a/debian/rules b/debian/rules
index 0deaef5..e04f1ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ binary-post-install/galaxd::
 # galax-doc, see #466277
 OCAML_OCAMLDOC_PACKAGES =
 OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
-OCAML_OCAMLDOC_DESTDIR_HTML = $(shell $(_cdbs_class_path)/ocamldoc-api-ref-config --html-directory libgalax-ocaml-dev)
+OCAML_OCAMLDOC_DESTDIR_HTML = $(shell /usr/share/ocaml/ocamldoc-api-ref-config --html-directory libgalax-ocaml-dev)
 # generate ocamldoc API reference and install it in galax-doc
 binary-install/galax-doc:: binary-install/libgalax-ocaml-dev
 binary-install/galax-doc::
@@ -67,7 +67,7 @@ binary-install/galax-doc::
 		-html -d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
 		|| true
 build/galax-doc:: debian/galax-doc-stamp
-	tmp=`$(_cdbs_class_path)/ocamldoc-api-ref-config --doc-base-generate libgalax-ocaml-dev` \
+	tmp=`/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate libgalax-ocaml-dev` \
 	&& mv $$tmp `echo $$tmp | sed s/libgalax-ocaml-dev/galax-doc/`
 debian/galax-doc-stamp:
 	$(MAKE) -C doc/ manual.pdf manual.html

-- 
galax packaging