* automake.texi (Top): Use @copying and @insertcopying.

Make Alexandre an author.
* automake.in ($gen_copyright): Add the "(C)" to Copyright.
* lib/depcomp: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 645a026..3a8aaa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-25  Akim Demaille  <akim@epita.fr>
+
+       * automake.texi (Top): Use @copying and @insertcopying.
+       Make Alexandre an author.
+       * automake.in ($gen_copyright): Add the "(C)" to Copyright.
+       * lib/depcomp: Likewise.
+
 2003-06-23  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/Variable.pm (vardef, rvardef, set_seen): New functions.

diff --git a/Makefile.in b/Makefile.in
index a9f1705..4786e31 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/automake.in b/automake.in
index 228ef51..124d5cf 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -246,7 +246,7 @@ my %standard_prefix =
 
 # Copyright on generated Makefile.ins.
 my $gen_copyright = "\
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/automake.texi b/automake.texi
index 5690a22..5190ade 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -7,6 +7,32 @@
 
 @include version.texi
 
+@copying
+
+This manual is for @acronym{GNU} Automake (version @value{VERSION},
+@value{UPDATED}), a program which creates GNU standards-compliant
+Makefiles from template files.  This edition documents version
+@value{VERSION}.
+
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the @acronym{GNU} Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with the Front-Cover texts
+being ``A @acronym{GNU} Manual,'' and with the Back-Cover Texts as in
+(a) below.  A copy of the license is included in the section entitled
+``@acronym{GNU} Free Documentation License.''
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and
+modify this @acronym{GNU} Manual, like @acronym{GNU} software.  Copies
+published by the Free Software Foundation raise funds for
+@acronym{GNU} development.''
+@end quotation
+@end copying
+
 @dircategory Software development
 @direntry
 * automake: (automake).                Making Makefile.in's.
@@ -17,64 +43,15 @@
 * aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
 @end direntry
 
-@ifinfo
-This file documents GNU automake @value{VERSION}
-
-Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the Foundation.
-@end ifinfo
-
-
 @titlepage
 @title GNU Automake
 @subtitle For version @value{VERSION}, @value{UPDATED}
-@author David MacKenzie and Tom Tromey
-
+@author David MacKenzie
+@author Tom Tromey
+@author Alexandre Duret-Lutz
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 1996, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-@sp 2
-This is the first edition of the GNU Automake documentation,@*
-and is consistent with GNU Automake @value{VERSION}.@*
-@sp 2
-Published by the Free Software Foundation @*
-59 Temple Place - Suite 330, @*
-Boston, MA 02111-1307 USA @*
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Free Software Foundation.
+@insertcopying
 @end titlepage
 
 @c Define an index of configure output variables.

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 5f47828..5afc26f 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 43e2a04..0a7642e 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 670a6ef..a3559ef 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 332b674..5d54908 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/lib/depcomp b/lib/depcomp
index 6ee57a6..ce87521 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/m4/Makefile.in b/m4/Makefile.in
index cc1342f..f8d3086 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/stamp-vti b/stamp-vti
index b0c900b..49de979 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2003
+@set UPDATED 25 June 2003
 @set UPDATED-MONTH June 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/tests/Makefile.in b/tests/Makefile.in
index df8a3bb..e26da4e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/version.texi b/version.texi
index b0c900b..49de979 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2003
+@set UPDATED 25 June 2003
 @set UPDATED-MONTH June 2003
 @set EDITION 1.7a
 @set VERSION 1.7a