From 66027a9bdc9bd3419f5a87e7d50c3ff0f2e920b8 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 25 Nov 2007 12:02:22 +0100 Subject: [PATCH] Fix uses of am__strip_dir. * lib/am/libs.am, lib/am/ltlib.am: Catch up with the change of definition of am__strip_dir. Signed-off-by: Akim Demaille --- ChangeLog | 6 ++++++ lib/am/libs.am | 11 +++++------ lib/am/ltlib.am | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea797ae77..314b2d68c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-25 Akim Demaille + + Fix uses of am__strip_dir. + * lib/am/libs.am, lib/am/ltlib.am: Catch up with the change of + definition of am__strip_dir. + 2007-11-25 Akim Demaille Define and use register_action. diff --git a/lib/am/libs.am b/lib/am/libs.am index d2f63894a..4c6a7c0e1 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -39,8 +39,7 @@ install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) ## Compute basename of source file. Unless this is a nobase_ target, we ## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.yo', ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'. -?BASE? f=$(am__strip_dir) \ -?!BASE? f=$$p; \ + %BASE?$(am__strip_dir):f=$$p;% \ echo " $(%DIR%LIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ $(%DIR%LIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ else :; fi; \ @@ -53,7 +52,7 @@ install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) @$(POST_INSTALL) @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ -?BASE? $(am__strip_dir) \ + %BASE?$(am__strip_dir):f=$$p;% \ ## Must ranlib after installing because mod time changes. echo " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$f"; \ @@ -71,9 +70,9 @@ if %?INSTALL% uninstall-%DIR%LIBRARIES: @$(NORMAL_UNINSTALL) @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ -?BASE? $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ - rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ + %BASE?$(am__strip_dir):f=$$p;% \ + echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ + rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done endif %?INSTALL% diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index d4781dfeb..aa1618423 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -39,7 +39,7 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) ## Compute basename of source file. Unless this is a nobase_ target, we ## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.yo', ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'. - %BASE?$(am__strip_dir):f=$$p%; \ + %BASE?$(am__strip_dir):f=$$p;% \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. ## Use INSTALL and not INSTALL_DATA because libtool knows the right -- 2.47.2