diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2012-04-12 16:24:23 +0000 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-13 12:48:27 +0200 |
| commit | 0bb6076152c98c9794434d81e746073bbb7305ad (patch) | |
| tree | 68d1ffe1fbd897d430a8f998a9fb5fb5cadbcec9 | |
| parent | 368f1c4c295e3cc4c442af986a1cbb0daa16e3ad (diff) | |
| download | automake-0bb6076152c98c9794434d81e746073bbb7305ad.tar.gz | |
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>
| -rw-r--r-- | lib/am/data.am | 2 | ||||
| -rw-r--r-- | lib/am/libs.am | 2 | ||||
| -rw-r--r-- | lib/am/ltlib.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index 98a38a832..b8b658800 100644 --- 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 4006bd008..d1f63ae84 100644 --- 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 65210c153..62ee1d2d5 100644 --- 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 |