diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2004-01-28 20:50:43 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2004-01-28 20:50:43 +0000 |
| commit | b5a48a3828b024a4681caa16fe8d22ae970669a5 (patch) | |
| tree | 19645f5bc9c601f1f283869e1ad2fba0ecf82546 /lib/am/data.am | |
| parent | ef1f2dadffe7ac7e61ebce08d1dd745eff12de5d (diff) | |
| download | automake-b5a48a3828b024a4681caa16fe8d22ae970669a5.tar.gz | |
* Makefile.am (maintainer-check): Check for unquoted $(DESTDIR) uses.
* lib/am/data.am, lib/am/distdir.am, lib/am/java.am, lib/am/libs.am,
lib/am/lisp.am, lib/am/ltlib.am, lib/am/mans.am, lib/am/progs.am,
lib/am/python.am, lib/am/scripts.am, lib/am/texinfos.am: Quote
installation paths in install, uninstall, and installcheck rules,
as well as in am__installdirs variables. This is for the sake
of paths containing spaces.
* lib/am/install.am (installdirs-am, installdirs): Do not try
to create "" directories.
* test/instspc.test: New file.
* test/Makefile.am (TESTS): Add instspc.test.
Report from James Amundson.
Diffstat (limited to 'lib/am/data.am')
| -rw-r--r-- | lib/am/data.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index 2ff1e644c..45a928c4b 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -26,14 +26,14 @@ endif %?INSTALL% ## ------------ ## if %?INSTALL% -am__installdirs += $(DESTDIR)$(%NDIR%dir) +am__installdirs += "$(DESTDIR)$(%NDIR%dir)" ?BASE?%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%) ?!BASE?%DIR%%PRIMARY%_INSTALL = $(install_sh_DATA) ?EXEC?.PHONY install-exec-am: install-%DIR%%PRIMARY% ?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY% install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(%NDIR%dir) + test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" ?!BASE? @$(am__vpath_adj_setup) \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -46,8 +46,8 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) ## new dir variable or use a nobase_ target for the latter case. ?BASE? f=$(am__strip_dir) \ ?!BASE? $(am__vpath_adj) \ - echo " $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ - $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ + echo " $(%DIR%%PRIMARY%_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ + $(%DIR%%PRIMARY%_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done endif %?INSTALL% @@ -65,8 +65,8 @@ uninstall-%DIR%%PRIMARY%: ?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ ?BASE? f=$(am__strip_dir) \ ?!BASE? $(am__vpath_adj) \ - echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ - rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ + echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ + rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done endif %?INSTALL% |