diff options
| author | Peter Zotov <whitequark@whitequark.org> | 2015-02-28 13:48:23 +0000 |
|---|---|---|
| committer | Peter Zotov <whitequark@whitequark.org> | 2015-02-28 13:48:23 +0000 |
| commit | fc21e4b4a897d34341ef23ac6bfcaa7e4f66fd7a (patch) | |
| tree | d4436ce4b2dc15b4a9ed2c97f66236f2d06d9b69 /docs | |
| parent | bac8d0ec70de0c6ef7333547ee1ea3446f0dae92 (diff) | |
[OCaml] Generate documentation again with autoconf buildsystem.
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/Makefile b/docs/Makefile index 690f7726b73..dcf2f39e2c5 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -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 '{}' ';'` |