diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2001-11-09 16:25:03 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2001-11-09 16:25:03 +0000 |
| commit | 480999011eb8dbc6a2baf74ad1864ecfa68cc530 (patch) | |
| tree | 8dd2a3b5a6469f18e4bed742c907038735d78f3f /lib/am/data.am | |
| parent | 4897452ad66dc377649b4ef2d1dd84a2abd3f92c (diff) | |
| download | automake-480999011eb8dbc6a2baf74ad1864ecfa68cc530.tar.gz | |
Fix for nobase.test:
* lib/am/header-vars.am (install_sh_DATA): New.
* lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use
%DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead
of $(INSTALL_DATA) for nobase_ targets.
* lib/am/lisp.am (install-%DIR%LISP): Likewise.
* lib/am/python.am (install-%DIR%PYTHON): Likewise.
* tests/nobase.test (configure.in): Append AC_OUTPUT.
* tests/Makefile.am (XFAIL_TESTS): Remove nobase.test.
Diffstat (limited to 'lib/am/data.am')
| -rw-r--r-- | lib/am/data.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index f7b48c27e..3187e0689 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -22,6 +22,8 @@ if %?INSTALL% _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%) @@ -33,12 +35,12 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) ## A file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ## If the _%PRIMARY% variable has an entry like foo/bar, install it as -## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a -## new dir variable for the latter case. +## $(destdir)/bar, not $(destdir)/foo/bar. The user can make a +## new dir variable or use a nobase_ target for the latter case. ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_%ONE_PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ - $(INSTALL_%ONE_PRIMARY%) $$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% |