install: shell parameter expansions can be used in directory names

Fixes automake bug#11232.

GNU automake used to support shell parameter expansion and command
substitutions in installation directories, but that was inadvertently
broken by commit v1.11-759-g368f1c4 "install: don't create empty dirs
when an empty 'foo_PRIMARY' is used" of 18-03-2012, where shell quoting
of generated MKDIR_P command was changed from double to single quotes
in 3 places, while some 21 other places still use double quotes for
generated MKDIR_P commands.

* lib/am/data.am: Use double quotes for generated "mkdir -p" commands.
* lib/am/libs.am: Likewise.
* lib/am/ltlib.am: Likewise.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/data.am b/lib/am/data.am
index 98a38a832109c1089ac630e643c0fcbd0ae57040..b8b658800096f72aa5a79d99c64a43fdf56b5945 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -33,7 +33,7 @@ if %?BASE%
        @list='$(%DIR%_%PRIMARY%)'; test -n "$(%NDIR%dir)" || list=; \
        if test -n "$$list"; then \
          echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
-         $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)' || exit 1; \
+         $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
        fi; \
        for p in $$list; do \
 ## A file can be in the source directory or the build directory.

diff --git a/lib/am/libs.am b/lib/am/libs.am
index 4006bd008814a37fde0f47b85b2533831e4e1e39..d1f63ae84a76f679d2c4f7bc98c36df3144ed95d 100644 (file)
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -47,7 +47,7 @@ else !%?BASE%
        @list='$(%DIR%_LIBRARIES)'; test -n "$(%NDIR%dir)" || list=; \
        if test -n "$$list"; then \
          echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
-         $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)' || exit 1; \
+         $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
        fi; \
        $(am__nobase_list) | while read dir files; do \
          xfiles=; for p in $$files; do \

diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 65210c153752407311b01d8ba5cb14372160c18b..62ee1d2d54ae1a2d5b95dd9e658074ce5eb43dc8 100644 (file)
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -38,7 +38,7 @@ if %?BASE%
        done; \
        test -z "$$list2" || { \
          echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
-         $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)' || exit 1; \
+         $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right