From 5df08c89380c3afbbbbc31b15fa18fc2bc8adacc Mon Sep 17 00:00:00 2001 From: Peter Zotov Date: Tue, 28 Oct 2014 22:45:25 +0000 Subject: [PATCH] [OCaml] PR14083, PR9606: Only pick *.odoc files from current build target. When several build targets, e.g. Debug+Asserts and Release+Asserts are present, ocamldoc complains of duplicate interfaces. llvm-svn: 220831 --- llvm/docs/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/docs/Makefile b/llvm/docs/Makefile index d973af5..690f772 100644 --- a/llvm/docs/Makefile +++ b/llvm/docs/Makefile @@ -1,10 +1,10 @@ ##===- docs/Makefile ---------------------------------------*- Makefile -*-===## -# +# # The LLVM Compiler Infrastructure # # This file is distributed under the University of Illinois Open Source # License. See LICENSE.TXT for details. -# +# ##===----------------------------------------------------------------------===## 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 \ - `$(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 -- 2.7.4