Use LLVM's new DESTDIR-less PROJ_* variables.

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

diff --git a/docs/Makefile b/docs/Makefile
index 9b706c7f36d229b113edd4a1865de6a21fa323ee..e9bbb28f68c4f631c12e285b0d3871307530e1fb 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -48,11 +48,11 @@ generated:: doxygen
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
        $(Echo) Installing HTML documentation
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-       $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-#      $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+       $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+#      $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
        $(Echo) Packaging HTML documentation
@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 
 install-doxygen: doxygen
        $(Echo) Installing doxygen documentation
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+       $(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) {} $(PROJ_docsdir)/html/doxygen \;
+           $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -94,4 +94,4 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
 
 uninstall-local::
        $(Echo) Uninstalling Documentation
-       $(Verb) $(RM) -rf $(PROJ_docsdir)
+       $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)

diff --git a/docs/tools/Makefile b/docs/tools/Makefile
index 12696ef0b659b44cb0ca9b1d1c47fad2b985b952..91bc447c083fd118f5f56957ce4f9e1d871990a0 100644 (file)
--- a/docs/tools/Makefile
+++ b/docs/tools/Makefile
@@ -84,9 +84,9 @@ EXTRA_DIST := $(POD)
 clean-local::
        $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
 
-HTML_DIR := $(PROJ_docsdir)/html/clang
-MAN_DIR  := $(PROJ_mandir)/man1
-PS_DIR   := $(PROJ_docsdir)/ps
+HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/clang
+MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
+PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
 
 install-html:: $(HTML)
        $(Echo) Installing HTML Clang Tools Documentation