From Brian Ford:

	* progs.am (install-@DIR@PROGRAMS, uninstall-@DIR@PROGRAMS):
	Invoke `sed' only once per program.
	* scripts.am (install-@DIR@SCRIPTS, uninstall-@DIR@SCRIPTS):
	Invoke `sed' only once per program.

diff --git a/ChangeLog b/ChangeLog
index 437a98787531938cd0f8cee9ee30683cc30d6c6b..e0c67918d1800acf06660d1164bd1044d20c4571 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-04-16  Tom Tromey  <tromey@cygnus.com>
+
+       From Brian Ford:
+       * progs.am (install-@DIR@PROGRAMS, uninstall-@DIR@PROGRAMS):
+       Invoke `sed' only once per program.
+       * scripts.am (install-@DIR@SCRIPTS, uninstall-@DIR@SCRIPTS):
+       Invoke `sed' only once per program.
+
 1999-04-13  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_subdirs): Make `install-recursive' phony.

diff --git a/THANKS b/THANKS
index d9b703328450757ae1e073fb3d28a6779eb7a8f1..bda4d430884f776a238392131c7ab36ec5f27705 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -14,6 +14,7 @@ Bernard Urban         Bernard.Urban@meteo.fr
 Bill Currie            bcurrie@tssc.co.nz
 Bill Davidson          bill@kayhay.com
 Bill Fenner            fenner@parc.xerox.com
+Brian Ford             ford@vss.fsi.com
 Brian Jones            cbj@nortel.net
 Chris Provenzano       proven@io.proven.org
 Dave Morrison          dave@bnl.gov

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 2044b0a10e2551d52ecd217e3fdd712fb4f17491..9dc9de286738513e7a22e7b3c49695d5c7de5511 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -21,7 +21,7 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LISP)'; for p in $$list; do \
-## A header file can be in the source directory or the build directory.
+## A lisp file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \

diff --git a/lib/am/progs.am b/lib/am/progs.am
index 061afe334eed2cd9cf414c6b68dc3f939d5e46a0..c43d3e4dba29a072f2216eab87b631681102d477 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -25,15 +25,16 @@ 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)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
+           f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else :; fi; \
        done
 
 uninstall-@DIR@PROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
-         file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
+         f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index ae282b5519ed31b5c686832fca524f777f54179e..99810be2b229a822afd57a134a595a2271d69ba9 100644 (file)
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -21,21 +21,22 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
+         f="`echo $$p|sed '$(transform)'`"; \
          if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else :; fi; fi; \
        done
 
 uninstall-@DIR@SCRIPTS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
-         file="`echo $$p|sed '$(transform)'`"; \
-         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
+         f="`echo $$p|sed '$(transform)'`"; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 ## Uncomment line in handle_scripts when this is uncommented.

diff --git a/lisp.am b/lisp.am
index 2044b0a10e2551d52ecd217e3fdd712fb4f17491..9dc9de286738513e7a22e7b3c49695d5c7de5511 100644 (file)
--- a/lisp.am
+++ b/lisp.am
@@ -21,7 +21,7 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LISP)'; for p in $$list; do \
-## A header file can be in the source directory or the build directory.
+## A lisp file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \

diff --git a/progs.am b/progs.am
index 061afe334eed2cd9cf414c6b68dc3f939d5e46a0..c43d3e4dba29a072f2216eab87b631681102d477 100644 (file)
--- a/progs.am
+++ b/progs.am
@@ -25,15 +25,16 @@ 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)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
+           f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else :; fi; \
        done
 
 uninstall-@DIR@PROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
-         file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
+         f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/scripts.am b/scripts.am
index ae282b5519ed31b5c686832fca524f777f54179e..99810be2b229a822afd57a134a595a2271d69ba9 100644 (file)
--- a/scripts.am
+++ b/scripts.am
@@ -21,21 +21,22 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
+         f="`echo $$p|sed '$(transform)'`"; \
          if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
          else :; fi; fi; \
        done
 
 uninstall-@DIR@SCRIPTS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
-         file="`echo $$p|sed '$(transform)'`"; \
-         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
+         f="`echo $$p|sed '$(transform)'`"; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 ## Uncomment line in handle_scripts when this is uncommented.