Changeset 2082

Timestamp:

Oct 19, 2009, 10:55:31 PM (13 years ago)

Author:

Peter

Message:

adding target installdirs-local, so make installdirs is complete.

Updated other install rules by making them safe against space in name
and removed test of existence before calling mkdir -p, instead check
that dirname is not empty before calling mkdir -p $dirname.

File:

• trunk/doc/Makefile.am (modified) (1 diff)

trunk/doc/Makefile.am

@@ -106 +106 @@
   $(DESTDIR)$(psdir)/$(PACKAGE).ps $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf
 
+installdirs-local:
+  for dir in $(htmldir)/html $(dvidir) $(psdir) $(pdfdir); do \
+    test -z "$(DESTDIR)$$dir" || $(MKDIR_P) "$(DESTDIR)$$dir"; \
+  done
+
+# local install rules does not generate any documentation, in order to
+# follow the recommendation in GCS that `make install' should not
+# modify/create anything in builddir, proved `make all' has just been
+# done. This is for the common case that `make all' is issued as one
+# user and `make install' is issued as, for example, superuser.
+
 install-html-local:
+  @$(NORMAL_INSTALL)
   @if test -d $(DX_HTML_OUTPUT); then \
-  test -d $(DESTDIR)$(htmldir)/html || \
+    echo "$(MKDIR_P) $(DESTDIR)$(htmldir)/html"; \
     $(MKDIR_P) $(DESTDIR)$(htmldir)/html;\
-  $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html; \
+    echo "$(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html"; \
+    $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html; \
   fi
 
 install-dvi-local:
   @if test -f "$(PACKAGE).dvi"; then \
-  test -d $(DESTDIR)$(dvidir) || $(MKDIR_P) $(DESTDIR)$(dvidir);\
-  $(INSTALL_DATA) $(PACKAGE).dvi \
-   $(DESTDIR)$(dvidir)/$(PACKAGE).dvi; \
-  $(ECHO) $(INSTALL_DATA) $(PACKAGE).dvi \
-   $(DESTDIR)$(dvidir)/$(PACKAGE).dvi; \
+    test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\
+    $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \
+    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
   fi
 
 install-ps-local:
   @if test -f "$(PACKAGE).ps"; then \
-  test -d $(DESTDIR)$(psdir) || $(MKDIR_P) $(DESTDIR)$(psdir);\
-  $(INSTALL_DATA) $(PACKAGE).ps \
-   $(DESTDIR)$(psdir)/$(PACKAGE).ps; \
-  $(ECHO) $(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps;\
+    test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\
+    $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \
+    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
   fi
 
 install-pdf-local:
   @if test -f "$(PACKAGE).pdf"; then \
-  test -d $(DESTDIR)$(pdfdir) || $(MKDIR_P) $(DESTDIR)$(pdfdir);\
-  $(INSTALL_DATA) $(PACKAGE).pdf \
-   $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf; \
-  $(ECHO) $(INSTALL_DATA) $(PACKAGE).pdf \
-   $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf; \
+    test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\
+    $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \
+    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
   fi