[OCaml] Generate documentation again with autoconf buildsystem.
authorPeter Zotov <whitequark@whitequark.org>
Sat, 28 Feb 2015 13:48:23 +0000 (13:48 +0000)
committerPeter Zotov <whitequark@whitequark.org>
Sat, 28 Feb 2015 13:48:23 +0000 (13:48 +0000)
Patch by Evangelos Foutras:

r220899 started using ocamlfind to build the OCaml bindings but
docs/Makefile still contains references to the OCAMLDOC macro which
is no longer being defined. The result is that OCaml documentation
isn't generated/installed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230850 91177308-0d34-0410-b5e6-96231b3b80d8

docs/Makefile

index 690f7726b732fad9f4cc132eee724b5324f71a0f..dcf2f39e2c5adaa16f519eaf8af3a2955447bfa9 100644 (file)
@@ -41,7 +41,7 @@ install_targets := install-html
 ifeq ($(ENABLE_DOXYGEN),1)
 install_targets += install-doxygen
 endif
-ifdef OCAMLDOC
+ifdef OCAMLFIND
 ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
 install_targets += install-ocamldoc
 endif
@@ -49,7 +49,7 @@ endif
 install-local:: $(install_targets)
 
 generated_targets := doxygen
-ifdef OCAMLDOC
+ifdef OCAMLFIND
 generated_targets += ocamldoc
 endif
 
@@ -120,7 +120,7 @@ regen-ocamldoc:
        $(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
        $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
        $(Verb) \
-               $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
+               $(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
                `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
                         -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`