From d385c669309edbf16df38120c5dbb3dd436af6da Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 23 Jun 1998 23:39:26 +0000 Subject: [PATCH] EXEEXT -vs- transform fix --- ChangeLog | 5 +++++ lib/am/progs.am | 6 +++--- progs.am | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70a957f7..38783296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 23 14:00:27 1998 Ian Lance Taylor + + * progs.am: Don't let $(EXEEXT) interfere with $(transform). + Report from Mike Stump . + Tue Jun 2 13:27:34 1998 Tom Tromey * automake.in (scan_one_configure_file): Make CONFIGURE file diff --git a/lib/am/progs.am b/lib/am/progs.am index 741902a7..3a598c37 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 741902a7..3a598c37 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 -- 2.43.5