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/python.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/python.am')
| -rw-r--r-- | lib/am/python.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/am/python.am b/lib/am/python.am index 4686576ca..cfe5d52ba 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -23,6 +23,8 @@ if %?INSTALL% _am_installdirs += $(DESTDIR)$(%NDIR%dir) +?BASE?%DIR%PYTHON_INSTALL = $(INSTALL_DATA) +?!BASE?%DIR%PYTHON_INSTALL = $(install_sh_DATA) ?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON ?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON install-%DIR%PYTHON: $(%DIR%_PYTHON) @@ -37,8 +39,8 @@ install-%DIR%PYTHON: $(%DIR%_PYTHON) ?!BASE? d="$$p"; \ dlist="$$dlist $$d"; \ ## Don't perform translation, since script name is important. - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d; \ + echo " $(%DIR%PYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d"; \ + $(%DIR%PYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d; \ else :; fi; \ done; \ ## Byte-compile must be done at install time, since file times are |