maintainer-clean patch for info

diff --git a/ChangeLog b/ChangeLog
index 3e66a0a12d988f015326dc0165e9b1d78ef99f44..4dc6fe1bd1044ea60b7e9b65d85bce9fc1463c00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  5 16:59:41 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_texinfo): Smarter test when deleting output
+       of makeinfo.
+
 Sat Aug  2 13:32:45 1997  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (do_check_merge_target): In --cygnus mode, check

diff --git a/Makefile.in b/Makefile.in
index 26a265c700fb225aaa400b212d6c361f8c770d6d..61326d722c0f32b6e9e1b0e5c22563d0c69df805 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,8 @@
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 
 SHELL = /bin/sh
@@ -122,9 +123,9 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 automake: $(top_builddir)/config.status automake.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@:automake.in CONFIG_HEADERS= ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@:aclocal.in CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
@@ -277,7 +278,12 @@ clean-aminfo:
 distclean-aminfo:
 
 maintainer-clean-aminfo:
-       for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done
+       for i in $(INFO_DEPS); do \
+         rm -f $$i; \
+         if test "`echo $$i-[0-9]*`" = "$$i-[0-9]*"; then \
+           rm -f $$i-[0-9]*; \
+         fi; \
+       done
 
 install-pkgdataDATA: $(pkgdata_DATA)
        @$(NORMAL_INSTALL)

diff --git a/automake.in b/automake.in
index 4eb58143c45936a6f9da4ec9c9b428aa85b2c5a3..27558fdcaba74cdf24276baa3320a92aeca3bdad 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2052,8 +2052,14 @@ sub handle_texinfo
     &pretty_print_rule ("\trm -f", "\t  ", @texi_cleans);
     $output_rules .= ("\nclean-aminfo:\n\ndistclean-aminfo:\n\n"
                      . "maintainer-clean-aminfo:\n\t"
-                     . 'for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done'
-                     . "\n");
+                     # Eww.  But how else can we find all the output
+                     # files from makeinfo?
+                     . 'for i in $(INFO_DEPS); do' . " \\\n"
+                     . "\t" . '  rm -f $$i;' . " \\\n"
+                     . "\t" . '  if test "`echo $$i-[0-9]*`" = "$$i-[0-9]*"; then' . " \\\n"
+                     . "\t" . '    rm -f $$i-[0-9]*;' . " \\\n"
+                     . "\t" . '  fi;' . " \\\n"
+                     . "\tdone\n");
     &push_phony_cleaners ('aminfo');
     if ($cygnus_mode)
     {

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 76a577d610a4d2978a351596b66c17bc2f676ba3..180ee4dc913a0e69716a85e214a757dc01af4f13 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -2,7 +2,8 @@
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 
 SHELL = /bin/sh

diff --git a/stamp-vti b/stamp-vti
index 53ca0ac7656ec6da6c070cf0f141d6503dee1e2e..0c52f26a66d09918194d95a8906775aecd2a5394 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 22 June 1997
+@set UPDATED 2 August 1997
 @set EDITION 1.2
 @set VERSION 1.2

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f4620e06af13db7e7826c78c6f236026042ea6f0..713e792d3b4782d3c72bd009df2986b492437ac8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -2,7 +2,8 @@
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 
 SHELL = /bin/sh

diff --git a/version.texi b/version.texi
index 53ca0ac7656ec6da6c070cf0f141d6503dee1e2e..0c52f26a66d09918194d95a8906775aecd2a5394 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 22 June 1997
+@set UPDATED 2 August 1997
 @set EDITION 1.2
 @set VERSION 1.2