95-ltxform.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&file_contents): Transform LIBTOOL.
        (&am_install_var): Remove $ltxform.
        * ltlib.am, progs.am: Adjust.
        
        
Index: automake.in
--- automake.in Thu, 01 Mar 2001 22:30:57 +0100 akim (am/f/39_automake.i 1.102 
755)
+++ automake.in Thu, 01 Mar 2001 22:54:50 +0100 akim (am/f/39_automake.i 1.102 
755)
@@ -6771,7 +6771,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';
 
@@ -7004,18 +7006,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)
     {
@@ -7252,7 +7242,6 @@ sub am_install_var
                                          'NDIR' => $nodir_name,
                                          'BASE' => $strip_subdir,
                                          'EXEC' => $exec_p)
-                             . $ltxform
                              . $cygxform);
        }
     }
Index: ltlib.am
--- ltlib.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/27_ltlib.am 1.4 644)
+++ ltlib.am Thu, 01 Mar 2001 22:45:53 +0100 akim (am/g/27_ltlib.am 1.4 644)
@@ -31,8 +31,10 @@
 ## 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 @@
 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
Index: progs.am
--- progs.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/20_progs.am 1.4 644)
+++ progs.am Thu, 01 Mar 2001 22:46:59 +0100 akim (am/g/20_progs.am 1.4 644)
@@ -30,8 +30,10 @@
 ## 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