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 <akim@lrde.epita.fr>

diff --git a/ChangeLog b/ChangeLog
index ea797ae..314b2d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-25  Akim Demaille  <akim@lrde.epita.fr>
 
+       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  <akim@lrde.epita.fr>
+
        Define and use register_action.
        * lib/Automake/Rule.pm: Fix a few typos in the doc.
        (&rule): Use || to simplify the code.

diff --git a/lib/am/libs.am b/lib/am/libs.am
index d2f6389..4c6a7c0 100644 (file)
--- 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 d4781df..aa16184 100644 (file)
--- 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