* progs.am (install-@DIR@PROGRAMS): Use `-e' instead of multiple

	sed invocations.  From Elrond.
	(uninstall-@DIR@PROGRAMS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 98ddc12731bf336386e8bc94f51939af56398f7b..5248b2dda4e0f106b59fe22d3c8da80d85a445bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-03-23  Tom Tromey  <tromey@cygnus.com>
 
+       * 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 51195278508b46cc4e9a7be9a1cda882d2d164d5..dc76c152ac0eceb11067c820ac9dd80ae8355a6d 100644 (file)
--- 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 aefad800299abd9f4573899a2f75e132135ae160..5179331f4e238ab69ad7d8437cd82021b3a029f1 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) $(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 aefad800299abd9f4573899a2f75e132135ae160..5179331f4e238ab69ad7d8437cd82021b3a029f1 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) $(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