From: Tom Tromey <tromey@redhat.com>
Date: Tue, 23 Jun 1998 23:39:29 +0000 (+0000)
Subject: EXEEXT -vs- transform fix
X-Git-Tag: Release-1-3b~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0b6cc5eb246db642be06bd473a8cc5e44dc7cb;p=thirdparty%2Fautomake.git

EXEEXT -vs- transform fix
---

diff --git a/ChangeLog b/ChangeLog
index 70a957f76..38783296d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 23 14:00:27 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* progs.am: Don't let $(EXEEXT) interfere with $(transform).
+	Report from Mike Stump <mrs@wrs.com>.
+
 Tue Jun  2 13:27:34 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (scan_one_configure_file): Make CONFIGURE file
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 741902a79..3a598c37e 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -25,13 +25,13 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-	    echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-	    @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	    echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
 uninstall-@DIR@PROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
diff --git a/progs.am b/progs.am
index 741902a79..3a598c37e 100644
--- a/progs.am
+++ b/progs.am
@@ -25,13 +25,13 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-	    echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-	    @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	    echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
 uninstall-@DIR@PROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done