copyright fixups

5 files changed, 45 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index aa60c06a1..6caa87084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Wed Aug 27 12:56:50 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* aclocal.in (write_aclocal): Print copyright and copying
+	permissions.  From RMS.
+	* automake.in (initialize_global_constants): More copyright stuff
+	from RMS.
+
 	* automake.in (handle_texinfo): Only require texinfo.tex in
 	appropriate situations.  Report from Paul D. Smith.
 
diff --git a/Makefile.in b/Makefile.in
index b81d415ef..fcea8a701 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)
@@ -321,7 +327,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+	rev=''; for subdir in $(SUBDIRS); do rev="$$subdir $$rev"; done; \
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
diff --git a/aclocal.in b/aclocal.in
index c156a4090..5b1141568 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -378,7 +378,19 @@ sub write_aclocal
 
     open (ACLOCAL, "> aclocal.m4")
 	|| die "aclocal: couldn't open \`aclocal.m4' for writing: $!\n";
-    print ACLOCAL "dnl aclocal.m4 generated automatically by aclocal $VERSION\n\n";
+    print ACLOCAL "dnl aclocal.m4 generated automatically by aclocal $VERSION\n";
+    print ACLOCAL "\
+dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+";
     print ACLOCAL $output;
     close (ACLOCAL);
 }
diff --git a/aclocal.m4 b/aclocal.m4
index 5b818cfad..3cd4ce203 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,16 @@
 dnl aclocal.m4 generated automatically by aclocal 1.2
 
+
+dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
diff --git a/automake.in b/automake.in
index eed301b16..7249ca004 100755
--- a/automake.in
+++ b/automake.in
@@ -5265,6 +5265,11 @@ sub initialize_global_constants
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 ";
 
     # Ignore return result from chmod, because it might give an error