Merging r259740:

[oota-llvm.git] / docs / Makefile

diff --git a/docs/Makefile b/docs/Makefile
index dcf2f39e2c5adaa16f519eaf8af3a2955447bfa9..da649bc887321200d01de23c8aef7e23785bd81e 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -16,24 +16,30 @@ DOXYGEN = doxygen
 
 $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in
        cat $< | sed \
-         -e 's/@abs_top_srcdir@/../g' \
          -e 's/@DOT@/dot/g' \
          -e 's/@PACKAGE_VERSION@/mainline/' \
          -e 's/@abs_top_builddir@/../g' \
+         -e 's/@abs_top_srcdir@/../g' \
+         -e 's/@enable_external_search@/NO/g' \
          -e 's/@enable_searchengine@/NO/g' \
-         -e 's/@searchengine_url@//g' \
          -e 's/@enable_server_based_search@/NO/g' \
-         -e 's/@enable_external_search@/NO/g' \
-         -e 's/@extra_search_mappings@//g' > $@
+         -e 's/@extra_search_mappings@//g' \
+         -e 's/@llvm_doxygen_generate_qhp@//g' \
+         -e 's/@llvm_doxygen_qch_filename@//g' \
+         -e 's/@llvm_doxygen_qhelpgenerator_path@//g' \
+         -e 's/@llvm_doxygen_qhp_cust_filter_attrs@//g' \
+         -e 's/@llvm_doxygen_qhp_cust_filter_name@//g' \
+         -e 's/@llvm_doxygen_qhp_namespace@//g' \
+         -e 's/@searchengine_url@//g' \
+         -e 's/@DOT_IMAGE_FORMAT@/png/g' \
+         > $@
 endif
 
 include $(LEVEL)/Makefile.common
 
 HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html) \
               $(wildcard $(PROJ_SRC_DIR)/*.css)
-DOXYFILES  := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \
-              doxygen.intro
-EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide
+DOXYFILES  := doxygen.cfg.in doxygen.intro
 
 .PHONY: install-html install-doxygen doxygen install-ocamldoc ocamldoc generated
 
@@ -72,11 +78,14 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 
 install-doxygen: doxygen
        $(Echo) Installing doxygen documentation
-       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
        $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
-       $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
-         $(FIND) . -type f -exec \
-           $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+       $(Verb) cd $(PROJ_OBJ_DIR)/doxygen/html && \
+         for DIR in $$($(FIND) . -type d); do \
+           DESTSUB="$(DESTDIR)$(PROJ_docsdir)/html/doxygen/$$(echo $$DIR | cut -c 3-)"; \
+           $(MKDIR) $$DESTSUB && \
+           $(FIND) $$DIR -maxdepth 1 -type f -exec $(DataInstall) {} $$DESTSUB \; ; \
+           if [ $$? != 0 ]; then exit 1; fi \
+         done
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz