For PR528:

Use the DataInstall and MKDIR macros instead of using $(INSTALL) directly

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

diff --git a/docs/CommandGuide/Makefile b/docs/CommandGuide/Makefile
index bc0d83fe5a4955c510f88f18a4d4d3d255186616..411bbfe53ca49940eef924d79323ea26ee434640 100644 (file)
--- a/docs/CommandGuide/Makefile
+++ b/docs/CommandGuide/Makefile
@@ -79,16 +79,16 @@ PS_DIR   := $(PROJ_docsdir)/ps
 
 install-local:: $(HTML) $(MAN) $(PS)
        $(Echo) Installing HTML CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(HTML_DIR)
-       $(Verb) $(INSTALL) -C $(HTML) $(HTML_DIR)
-       $(Verb) $(INSTALL) -C $(PROJ_SRC_DIR)/index.html $(HTML_DIR)
-       $(Verb) $(INSTALL) -C $(PROJ_SRC_DIR)/manpage.css $(HTML_DIR)
+       $(Verb) $(MKDIR) $(HTML_DIR)
+       $(Verb) $(DataInstall) $(HTML) $(HTML_DIR)
+       $(Verb) $(DataInstall) $(PROJ_SRC_DIR)/index.html $(HTML_DIR)
+       $(Verb) $(DataInstall) -C $(PROJ_SRC_DIR)/manpage.css $(HTML_DIR)
        $(Echo) Installing MAN CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(MAN_DIR)
-       $(Verb) $(INSTALL) -C $(MAN) $(MAN_DIR)
+       $(Verb) $(MKDIR) $(MAN_DIR)
+       $(Verb) $(DataInstall) $(MAN) $(MAN_DIR)
        $(Echo) Installing PS CommandGuide Documentation
-       $(Verb) $(INSTALL) -d $(PS_DIR)
-       $(Verb) $(INSTALL) -C $(PS) $(PS_DIR)
+       $(Verb) $(MKDIR) $(PS_DIR)
+       $(Verb) $(DataInstall) $(PS) $(PS_DIR)
 
 uninstall-local::
        $(Echo) Uninstalling Documentation

diff --git a/docs/Makefile b/docs/Makefile
index c15f1cc345c4152d80495ed0b439805650a0df3b..ccaba80e0de44d357ea4ca50e11b7b8c247749ce 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -29,11 +29,11 @@ endif
 
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
        $(Echo) Installing HTML documentation
-       $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html
-       $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html/img
-       $(Verb) $(INSTALL) -C $(HTML) $(PROJ_docsdir)/html
-       $(Verb) $(INSTALL) -C $(IMAGES) $(PROJ_docsdir)/html/img
-       $(Verb) $(INSTALL) -C $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+       $(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)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
        $(Echo) Packaging HTML documentation
@@ -45,11 +45,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 install-doxygen: doxygen
        $(Echo) Installing doxygen documentation
        $(Echo) Installing doxygen documentation
-       $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html/doxygen
-       $(Verb) $(INSTALL) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+       $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
        $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
          $(FIND) . -type f -exec \
-           $(INSTALL) -C {} $(PROJ_docsdir)/html/doxygen \;
+           $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
 
 doxygen: $(PROJ_OBJ_DIR)/doxygen.tar.gz