[Pkg-ocaml-maint-commits] [SCM] ocamlviz packaging branch, ocamlbuild, updated. upstream/1.01-14-g173728e

[Mehdi Dogguy]

The following commit has been merged in the ocamlbuild branch:
commit 173728ee56d4faf1bfa234cd437ca29804522a11
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Mar 26 01:36:02 2010 +0100

    Move documentation in doc directory

diff --git a/Makefile.in b/Makefile.in
index ae16052..e54ea9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,7 @@ install-opt:
 .PHONY: doc/manual.pdf
 
 doc:
-	$(OCAMLBUILD) ocamlviz.docdir/index.html
+	$(OCAMLBUILD) doc/ocamlviz.docdir/index.html
 
 doc/manual.pdf: doc/manual.tex
 	cd doc && mlpost -native -latex manual.tex -pdf fig.ml && pdflatex manual.tex
diff --git a/ocamlviz.odocl b/doc/ocamlviz.odocl
similarity index 100%
rename from ocamlviz.odocl
rename to doc/ocamlviz.odocl
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 4f4078f..af985fb 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -177,8 +177,8 @@ let _ =
              Echo([substitute [("@VERSION@", get_version ())] (read_file "META.in")], "META"));
 
         (* Documentation *)
-        tag_file "ocamlviz.docdir/index.html" ["apiref"];
-        flag ["apiref"] & S[A "-sort"; A"-colorize-code"];
+        tag_file "doc/ocamlviz.docdir/index.html" ["apiref"];
+        flag ["apiref"] & S[A "-sort"; A"-colorize-code"; A"-I"; A"src"];
 
         (* Threads *)
         flag ["ocaml"; "compile"] & S[A "-thread"];

-- 
ocamlviz packaging