From: Akim Demaille <akim@epita.fr>
Date: Mon, 5 Mar 2001 14:42:55 +0000 (+0000)
Subject: * automake.in (&file_contents): Transform LIBTOOL.
X-Git-Tag: handle-languages~182
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=44393e1f6d1cc631f37cc428f331bf0dc53171fb;p=automake.git

* automake.in (&file_contents): Transform LIBTOOL.
(&am_install_var): Remove $ltxform.
* ltlib.am, progs.am: Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index c5b720ab..f2f62fd7 100644
--- 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 f35427c2..edc0149a 100755
--- 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 9877e2e6..4ed93d97 100644
--- 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 c4d03d6e..d8995c76 100644
--- 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 9877e2e6..4ed93d97 100644
--- 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 c4d03d6e..d8995c76 100644
--- 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