* automake.in (&file_contents): Transform LIBTOOL.

(&am_install_var): Remove $ltxform.
* ltlib.am, progs.am: Adjust.

diff --git a/ChangeLog b/ChangeLog
index c5b720ab2cd22e3ebdfbcdcaeb57f029f4b2b986..f2f62fd701e460b354ba5a54c5c7d1e836410ea8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&file_contents): Transform LIBTOOL.
+       (&am_install_var): Remove $ltxform.
+       * ltlib.am, progs.am: Adjust.
+
+       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in: Require AC_PROG_INSTALL in...

diff --git a/automake.in b/automake.in
index f35427c23472dd4104671d10f74e4e30de1b679f..edc0149ae9a1aa49c66f58769b245fef3438d356 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6788,7 +6788,9 @@ sub file_contents
                      'CK-NEWS'      => $options{'check-news'},
 
                      'SUBDIRS'      => &variable_defined ('SUBDIRS'),
-                     'CONFIGURE-AC' => $configure_ac)
+                     'CONFIGURE-AC' => $configure_ac,
+
+                     'LIBTOOL'      => defined $configure_vars{'LIBTOOL'})
          # We don't need more than two consecutive new-lines.
          . 's/\n{3,}/\n\n/g';
 
@@ -7021,18 +7023,6 @@ sub am_install_var
 {
     my (@args) = @_;
 
-    my $ltxform;
-    if (defined $configure_vars{'LIBTOOL'})
-    {
-       # Transform '%LIBTOOL ...%' to '$(LIBTOOL) ...'
-       $ltxform = 's/%LIBTOOL([^\%]*)%/\$(LIBTOOL) $1/g;';
-    }
-    else
-    {
-       # Delete '%LIBTOOL ...%'
-       $ltxform = 's/%LIBTOOL([^%]*)%//g;';
-    }
-
     my $cygxform;
     if (! $seen_exeext)
     {
@@ -7269,7 +7259,6 @@ sub am_install_var
                                          'NDIR' => $nodir_name,
                                          'BASE' => $strip_subdir,
                                          'EXEC' => $exec_p)
-                             . $ltxform
                              . $cygxform);
        }
     }

diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 9877e2e65e29c797b77c72ffc49aad49c040a2e5..4ed93d97c1a8aca3b06bd0b413f55bd2a344c553 100644 (file)
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -31,8 +31,10 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-           echo " %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-           %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?LIBTOOL?          echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?          $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?!LIBTOOL?         echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?         $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
          else :; fi; \
        done
 
@@ -40,6 +42,8 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 uninstall-%DIR%LTLIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-         echo " %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-         %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?LIBTOOL?        echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?!LIBTOOL?       echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?       rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
        done

diff --git a/lib/am/progs.am b/lib/am/progs.am
index c4d03d6ec8221a3a2966e2816432d0f32f7fe7c4..d8995c767094704b6e3a1fc4689d39c5bac44201 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -30,8 +30,10 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
            f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           echo " $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?LIBTOOL?          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?LIBTOOL?          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?!LIBTOOL?         echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?!LIBTOOL?         $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
          else :; fi; \
        done
 

diff --git a/ltlib.am b/ltlib.am
index 9877e2e65e29c797b77c72ffc49aad49c040a2e5..4ed93d97c1a8aca3b06bd0b413f55bd2a344c553 100644 (file)
--- a/ltlib.am
+++ b/ltlib.am
@@ -31,8 +31,10 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-           echo " %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-           %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?LIBTOOL?          echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?          $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?!LIBTOOL?         echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?         $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
          else :; fi; \
        done
 
@@ -40,6 +42,8 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 uninstall-%DIR%LTLIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-         echo " %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-         %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?LIBTOOL?        echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?!LIBTOOL?       echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?       rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
        done

diff --git a/progs.am b/progs.am
index c4d03d6ec8221a3a2966e2816432d0f32f7fe7c4..d8995c767094704b6e3a1fc4689d39c5bac44201 100644 (file)
--- a/progs.am
+++ b/progs.am
@@ -30,8 +30,10 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
            f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           echo " $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?LIBTOOL?          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?LIBTOOL?          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?!LIBTOOL?         echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?!LIBTOOL?         $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
          else :; fi; \
        done