From a35c1ae89084f31c683b109d35f088aca5873f79 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 5 Aug 1997 23:10:44 +0000
Subject: [PATCH] maintainer-clean patch for info

---
 ChangeLog         |  5 +++++
 Makefile.in       | 14 ++++++++++----
 automake.in       | 10 ++++++++--
 m4/Makefile.in    |  3 ++-
 stamp-vti         |  2 +-
 tests/Makefile.in |  3 ++-
 version.texi      |  2 +-
 7 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e66a0a1..4dc6fe1b 100644
--- 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 26a265c7..61326d72 100644
--- 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 4eb58143..27558fdc 100755
--- 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 76a577d6..180ee4dc 100644
--- 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 53ca0ac7..0c52f26a 100644
--- 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 f4620e06..713e792d 100644
--- 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 53ca0ac7..0c52f26a 100644
--- 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
-- 
2.43.5