EXEEXT -vs- transform fix

diff --git a/ChangeLog b/ChangeLog
index 70a957f76903e92a7e21450ce216f40d16fd90b8..38783296dc190b8e6b309f04ec2664ce0638b5b5 100644 (file)
--- 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 741902a79585bea456466b3fcaf8ca57def446f3..3a598c37ea488e4929166a2497544c598543a372 100644 (file)
--- 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 741902a79585bea456466b3fcaf8ca57def446f3..3a598c37ea488e4929166a2497544c598543a372 100644 (file)
--- 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