diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-20 17:33:29 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-20 17:36:36 +0200 |
| commit | 4792c5dfd78723d57e8b45d77cae50c5d1e16d54 (patch) | |
| tree | ac1b67479d9948d06c2f5f6e91c1951e55cd5f15 /lib/am/libs.am | |
| parent | 91d9d817eae55f025aa5143f70e382a2f0f17670 (diff) | |
| download | automake-4792c5dfd78723d57e8b45d77cae50c5d1e16d54.tar.gz | |
Remove unneeded per-rule *INSTALL variables.
* NEWS: Update.
* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
(install-%DIR%%PRIMARY%): Adjust.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
(install-%DIR%LIBRARIES): Adjust.
* lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
(install-%DIR%LTLIBRARIES): Adjust.
* lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
(install-%DIR%PROGRAMS): Adjust.
* lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
(install-%DIR%PYTHON): Adjust.
* lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
(install-%DIR%SCRIPTS): Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'lib/am/libs.am')
| -rw-r--r-- | lib/am/libs.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/am/libs.am b/lib/am/libs.am index 006400940..ee0061eb0 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -25,7 +25,6 @@ endif %?INSTALL% if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -%DIR%LIBRARIES_INSTALL = $(INSTALL_DATA) .PHONY install-%EXEC?exec:data%-am: install-%DIR%LIBRARIES install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) @$(NORMAL_INSTALL) @@ -39,8 +38,8 @@ if %?BASE% else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(%DIR%LIBRARIES_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \ - $(%DIR%LIBRARIES_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)" || exit $$?; } + echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \ + $(INSTALL_DATA) $$list2 "$(DESTDIR)$(%NDIR%dir)" || exit $$?; } else !%?BASE% ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -52,8 +51,8 @@ else !%?BASE% test "x$$dir" = x. || { \ echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \ $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \ - echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \ - $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \ + echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \ + $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \ done endif !%?BASE% ## We do two loops here so that $(POST_INSTALL) can be empty. If we |