From 8e8b5d08dd5198e8a2592e235bb9ae19dc8d1d69 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 23 Mar 1999 13:59:38 +0000 Subject: [PATCH] * progs.am (install-@DIR@PROGRAMS): Use `-e' instead of multiple sed invocations. From Elrond. (uninstall-@DIR@PROGRAMS): Likewise. --- ChangeLog | 4 ++++ THANKS | 1 + lib/am/progs.am | 6 +++--- progs.am | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98ddc127..5248b2dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1999-03-23 Tom Tromey + * progs.am (install-@DIR@PROGRAMS): Use `-e' instead of multiple + sed invocations. From Elrond. + (uninstall-@DIR@PROGRAMS): Likewise. + * automake.in (lang_lex_finish): Rewrite `l', not `y', to `c'. From Ralf Corsepius. diff --git a/THANKS b/THANKS index 51195278..dc76c152 100644 --- a/THANKS +++ b/THANKS @@ -22,6 +22,7 @@ David Zaroski cz253@cleveland.Freenet.Edu Dieter Baron dillo@stieltjes.smc.univie.ac.at Doug Evans devans@cygnus.com Eleftherios Gkioulekas lf@amath.washington.edu +Elrond Elrond@Wunder-Nett.org Erez Zadok ezk@cs.columbia.edu Erick Branderhorst branderh@iaehv.nl François Pinard pinard@iro.umontreal.ca diff --git a/lib/am/progs.am b/lib/am/progs.am index aefad800..5179331f 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) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e '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 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \ done diff --git a/progs.am b/progs.am index aefad800..5179331f 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) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e '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 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \ done -- 2.43.5