[OCaml] PR14083, PR9606: Only pick *.odoc files from current build target.
authorPeter Zotov <whitequark@whitequark.org>
Tue, 28 Oct 2014 22:45:25 +0000 (22:45 +0000)
committerPeter Zotov <whitequark@whitequark.org>
Tue, 28 Oct 2014 22:45:25 +0000 (22:45 +0000)
When several build targets, e.g. Debug+Asserts and Release+Asserts
are present, ocamldoc complains of duplicate interfaces.

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

docs/Makefile

index d973af583e0055d850b432e0e2649b35180cd022..690f7726b732fad9f4cc132eee724b5324f71a0f 100644 (file)
@@ -1,10 +1,10 @@
 ##===- docs/Makefile ---------------------------------------*- Makefile -*-===##
 ##===- docs/Makefile ---------------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LEVEL      := ..
 ##===----------------------------------------------------------------------===##
 
 LEVEL      := ..
@@ -121,7 +121,8 @@ regen-ocamldoc:
        $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
        $(Verb) \
                $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
        $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
        $(Verb) \
                $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
-               `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" -exec echo -load '{}' ';'`
+               `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
+                        -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
 
 uninstall-local::
        $(Echo) Uninstalling Documentation
 
 uninstall-local::
        $(Echo) Uninstalling Documentation