The following commit has been merged in the master branch:
commit bdc326f557fc49e78dab7d5a33d6980a20cfea37
Author: Samuel Mimram <[email protected]>
Date: Thu Feb 19 09:53:30 2009 +0100
Use native ocamldoc if available.
diff --git a/debian/changelog b/debian/changelog
index c931bf3..ca243a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ lablgtk2 (2.12.0-2) UNRELEASED; urgency=low
[ Samuel Mimram ]
* Use dh-ocaml predefined variables in rules.
+ * Use native version of ocamldoc if available.
- -- Samuel Mimram <[email protected]> Thu, 19 Feb 2009 09:34:31 +0100
+ -- Samuel Mimram <[email protected]> Thu, 19 Feb 2009 09:53:01 +0100
lablgtk2 (2.12.0-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 0a3c54c..880f109 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk
include /usr/share/ocaml/ocamlinit.mk
DESTDIR = $(CURDIR)/debian/tmp
+OCAMLDOC = $(if $(OCAML_OPT_ARCH),ocamldoc.opt,ocamldoc)
# We want to use dpatch.
include /usr/share/dpatch/dpatch.make
@@ -105,7 +106,7 @@ binary-arch: build install
mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
find debian/$$i/$(OCAML_STDLIB_DIR)/ \
-type f -name '*.mli' \
- | xargs ocamldoc -I $(OCAML_STDLIB_DIR)/lablgl -I
$(OCAML_STDLIB_DIR)/threads \
+ | xargs $(OCAMLDOC) -I $(OCAML_STDLIB_DIR)/lablgl -I
$(OCAML_STDLIB_DIR)/threads \
-pp "sed 's/@gtkdoc *\([A-Za-z-]* *[A-Za-z-]*\)/\(gtkdoc: \1\)/g'"
\
-stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
-d debian/$$i/usr/share/doc/$$i/html/api \
--
lablgtk2 packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
