projects / packages / llvm.git / blame
| Commit | Line | Data |
|---|---|---|
| 4ba3b2b3 JB |
1 | diff -upr llvm-3.6.0.src.orig/docs/Makefile llvm-3.6.0.src/docs/Makefile |
| 2 | --- llvm-3.6.0.src.orig/docs/Makefile 2014-10-29 00:45:25.000000000 +0200 | |
| 3 | +++ llvm-3.6.0.src/docs/Makefile 2015-02-28 10:12:35.647351241 +0200 | |
| 4 | @@ -41,7 +41,7 @@ install_targets := install-html | |
| 5 | ifeq ($(ENABLE_DOXYGEN),1) | |
| 6 | install_targets += install-doxygen | |
| 7 | endif | |
| 8 | -ifdef OCAMLDOC | |
| 9 | +ifdef OCAMLFIND | |
| 10 | ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD))) | |
| 11 | install_targets += install-ocamldoc | |
| 12 | endif | |
| 13 | @@ -49,7 +49,7 @@ endif | |
| 14 | install-local:: $(install_targets) | |
| 15 | ||
| 16 | generated_targets := doxygen | |
| 17 | -ifdef OCAMLDOC | |
| 18 | +ifdef OCAMLFIND | |
| 19 | generated_targets += ocamldoc | |
| 20 | endif | |
| 21 | ||
| 22 | @@ -120,7 +120,7 @@ regen-ocamldoc: | |
| 23 | $(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc | |
| 24 | $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html | |
| 25 | $(Verb) \ | |
| 26 | - $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \ | |
| 27 | + $(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \ | |
| 28 | `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \ | |
| 29 | -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'` | |
| 30 |