[patch] mkinstalldirs used conditionally

[Roger Leigh]

I sent a link to my patch a week ago, but I didn't see any reply.  Is
there anything wrong with this patch?

Regards,
Roger

diff -urN automake/lib/am/data.am automake-new/lib/am/data.am
--- automake/lib/am/data.am     Fri Nov  9 16:25:03 2001
+++ automake-new/lib/am/data.am Fri Mar  1 23:26:36 2002
@@ -28,7 +28,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY%
 install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_%PRIMARY%)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
diff -urN automake/lib/am/java.am automake-new/lib/am/java.am
--- automake/lib/am/java.am     Wed May 30 03:02:50 2001
+++ automake-new/lib/am/java.am Sat Mar  2 00:39:10 2002
@@ -42,7 +42,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%JAVA
 install-%DIR%JAVA: class%DIR%.stamp
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_JAVA)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## A single .java file can be compiled into multiple .class files.  So
 ## we just install all the .class files that got built into this
 ## directory.  This is not optimal, but will have to do for now.
diff -urN automake/lib/am/libs.am automake-new/lib/am/libs.am
--- automake/lib/am/libs.am     Thu Jun 28 16:06:50 2001
+++ automake-new/lib/am/libs.am Fri Mar  1 23:26:36 2002
@@ -37,7 +37,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
 install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_LIBRARIES)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
diff -urN automake/lib/am/lisp.am automake-new/lib/am/lisp.am
--- automake/lib/am/lisp.am     Fri Nov  9 16:25:03 2001
+++ automake-new/lib/am/lisp.am Fri Mar  1 23:26:36 2002
@@ -44,7 +44,9 @@
        @$(NORMAL_INSTALL)
 ## lispdir might not be defined.
        @if test -n "$(lispdir)"; then \
-         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+         if test -n '$(%DIR%_LISP)'; then \
+           $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+         fi; \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
          list='$(%DIR%_LISP)'; for p in $$list; do \
diff -urN automake/lib/am/ltlib.am automake-new/lib/am/ltlib.am
--- automake/lib/am/ltlib.am    Mon Apr  9 10:50:33 2001
+++ automake-new/lib/am/ltlib.am        Fri Mar  1 23:26:36 2002
@@ -27,7 +27,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
 install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_LTLIBRARIES)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
diff -urN automake/lib/am/mans.am automake-new/lib/am/mans.am
--- automake/lib/am/mans.am     Sun May  6 06:40:47 2001
+++ automake-new/lib/am/mans.am Sat Mar  2 00:43:25 2002
@@ -31,7 +31,6 @@
 .PHONY install-man: install-man%SECTION%
 install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir)
        @list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) 
$(nodist_man%SECTION%_MANS)'; \
 ## Extract all items from man_MANS that should go in this section.
 ## This must be done dynamically to support conditionals.
@@ -42,6 +41,10 @@
            *.%SECTION%*) list="$$list $$i" ;; \
          esac; \
        done; \
+## Make the installation directory if there are MANS to install
+       if test -n "`echo $$list | sed -e 's/ //g'`"; then \
+         $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir); \
+       fi; \
        for i in $$list; do \
 ## Find the file.
          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
diff -urN automake/lib/am/progs.am automake-new/lib/am/progs.am
--- automake/lib/am/progs.am    Sun Jul 22 22:50:18 2001
+++ automake-new/lib/am/progs.am        Fri Mar  1 23:26:36 2002
@@ -28,7 +28,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
 install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_PROGRAMS)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
diff -urN automake/lib/am/python.am automake-new/lib/am/python.am
--- automake/lib/am/python.am   Fri Nov  9 16:25:03 2001
+++ automake-new/lib/am/python.am       Sat Mar  2 00:39:31 2002
@@ -29,7 +29,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
 install-%DIR%PYTHON: $(%DIR%_PYTHON)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_PYTHON)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
        @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
          if test -f $(srcdir)/$$p; then \
 ## Compute basename of source file.  Unless this is a nobase_ target, we
diff -urN automake/lib/am/scripts.am automake-new/lib/am/scripts.am
--- automake/lib/am/scripts.am  Mon Apr  9 15:23:09 2001
+++ automake-new/lib/am/scripts.am      Fri Mar  1 23:26:36 2002
@@ -28,7 +28,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS
 install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+       if test -n '$(%DIR%_SCRIPTS)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
+       fi
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
diff -urN automake/lib/am/texinfos.am automake-new/lib/am/texinfos.am
--- automake/lib/am/texinfos.am Tue Oct  2 17:00:04 2001
+++ automake-new/lib/am/texinfos.am     Fri Mar  1 23:26:36 2002
@@ -106,7 +106,9 @@
 if %?LOCAL-TEXIS%
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(infodir)
+       if test -n '$(INFO_DEPS)'; then \
+         $(mkinstalldirs) $(DESTDIR)$(infodir); \
+       fi
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
 ?CYGNUS?         if test -f $$file; then d=.; else d=$(srcdir); fi; \


-- 
Roger Leigh
                ** Registration Number: 151826, http://counter.li.org **
                Need Epson Stylus Utilities? http://gimp-print.sourceforge.net/
                GPG Public Key: 0x25BFB848 available on public keyservers