diff options
Diffstat (limited to 'lib/am/libs.am')
| -rw-r--r-- | lib/am/libs.am | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/lib/am/libs.am b/lib/am/libs.am index b6d5caaf4..fbf9a8912 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -14,10 +14,6 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -if %?INSTALL% -include inst-vars.am -endif %?INSTALL% - ## ------------ ## ## Installing. ## ## ------------ ## @@ -67,11 +63,11 @@ endif !%?BASE% ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. @$(POST_INSTALL) - @list='$(%DIR%_LIBRARIES)'; test -n "$(%NDIR%dir)" || list=; \ - for p in $$list; do \ - if test -f $$p; then \ -?BASE? $(am__strip_dir) \ -?!BASE? f=$$p; \ +?BASE? @list='$(notdir $(%DIR%_LIBRARIES))'; \ +?!BASE? @list='$(%DIR%_LIBRARIES)'; \ + test -n "$(%NDIR%dir)" || list=; \ + for f in $$list; do \ + if test -f $$f; then \ ## Must ranlib after installing because mod time changes. ## cd to target directory because AIX ranlib messes up with whitespace ## in the argument. @@ -90,10 +86,10 @@ if %?INSTALL% .PHONY uninstall-am: uninstall-%DIR%LIBRARIES uninstall-%DIR%LIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(%DIR%_LIBRARIES)'; test -n "$(%NDIR%dir)" || list=; \ -?BASE? files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -?!BASE? $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - dir='$(DESTDIR)$(%NDIR%dir)'; $(am__uninstall_files_from_dir) + $(call am.uninst.cmd,$(%NDIR%dir), \ +?BASE? $(notdir $(%DIR%_LIBRARIES)) \ +?!BASE? $(patsubst $(srcdir)/%,%,$(%DIR%_LIBRARIES)) \ + ) endif %?INSTALL% @@ -101,6 +97,4 @@ endif %?INSTALL% ## Cleaning. ## ## ---------- ## -.PHONY clean-am: clean-%DIR%LIBRARIES -clean-%DIR%LIBRARIES: - -test -z "$(%DIR%_LIBRARIES)" || rm -f $(%DIR%_LIBRARIES) +am.clean.normal.f += $(%DIR%_LIBRARIES) |