* automake.in (check_gnu_standards): In --gnu mode, accept

one of COPTING, COPYING.LESSER, or COPYING.LIB.
(common_files): Add COPYING.LESSER.
* automake.texi (Gnits): Document this.

diff --git a/ChangeLog b/ChangeLog
index d29c613ffee432be23e6ab3d89c320ef0990b30d..2455b59a37335c1bdb946877f497a39d21e8f344 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-03  Paolo Bonzini  <bonzini@gnu.org>
+
+       * automake.in (check_gnu_standards): In --gnu mode, accept
+       one of COPTING, COPYING.LESSER, or COPYING.LIB.
+       (common_files): Add COPYING.LESSER.
+       * automake.texi (Gnits): Document this.
+
 2002-05-03  Paolo Bonzini  <bonzini@gnu.org>
 
        * automake.in (required_targets): Add the pdf and pdf-am targets.

diff --git a/automake.in b/automake.in
index 21faec3f0f4f7c2c8b115eb54a7e80d0a9526d2d..926b3e888ac615dc88a09d6eaf9f42aed72448a3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -188,7 +188,7 @@ my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh);
 # DISTFILES.
 my @common_files =
     (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
-       ChangeLog INSTALL NEWS README THANKS TODO acinclude.m4
+       COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO acinclude.m4
        ansi2knr.1 ansi2knr.c compile config.guess config.rpath config.sub
        configure configure.ac configure.in depcomp elisp-comp
        install-sh libversion.in mdate-sh missing mkinstalldirs
@@ -4834,8 +4834,15 @@ sub check_gnu_standards
     if ($relative_dir eq '.')
     {
        # In top level (or only) directory.
-       require_file ("$am_file.am", GNU,
-                     qw(INSTALL NEWS README COPYING AUTHORS ChangeLog));
+
+       # Accept one of these three licenses; default to COPYING.
+       my $license = 'COPYING';
+        foreach (qw /COPYING.LIB COPYING.LESSER/)
+       {
+           $license = $_ if -f $_;
+       }
+       require_file ("$am_file.am", GNU, $license,
+                     qw/INSTALL NEWS README AUTHORS ChangeLog/);
     }
 
     if ($strictness >= GNU

diff --git a/automake.texi b/automake.texi
index feecc2931aec41df82bcc6d81b9ea4cbdfc994aa..887bdd4ba93f13206b25e359e6cb229403a8fa21 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -4487,9 +4487,9 @@ variable) causes @code{automake} to check the following:
 
 @itemize @bullet
 @item
-The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{COPYING},
-@file{AUTHORS}, and @file{ChangeLog} are required at the topmost
-directory of the package.
+The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{AUTHORS},
+and @file{ChangeLog}, plus one of @file{COPYING.LIB}, @file{COPYING.LESSER}
+or @file{COPYING}, are required at the topmost directory of the package.
 
 @item
 The options @samp{no-installman} and @samp{no-installinfo} are

diff --git a/stamp-vti b/stamp-vti
index 937b3793a3783125667b61cf502018a1180cfddd..9815744bca42150190addb8427ed64d928709c5b 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 11 June 2002
+@set UPDATED 13 June 2002
 @set UPDATED-MONTH June 2002
 @set EDITION 1.6a
 @set VERSION 1.6a

diff --git a/version.texi b/version.texi
index 937b3793a3783125667b61cf502018a1180cfddd..9815744bca42150190addb8427ed64d928709c5b 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 11 June 2002
+@set UPDATED 13 June 2002
 @set UPDATED-MONTH June 2002
 @set EDITION 1.6a
 @set VERSION 1.6a