Re: patch 1 - don't require COPYING if LGPL used

[Alexandre Duret-Lutz]

>>> "Bonzini" == Bonzini  <address@hidden> writes:

 Bonzini> This patch distributes COPYING.LESSER automatically, and no longer
 Bonzini> requires COPYING if COPYING.LESSER or COPYING.LIB is found.

 Bonzini> Since I was at it, I modified common_files to also distribute shtool.

(let's keep this for patch 3)

Are you ok with this variant of your patch?  The point is simply
to not repeat the list of required files.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1871
diff -u -r1.1871 ChangeLog
--- ChangeLog   13 Jun 2002 08:09:27 -0000      1.1871
+++ ChangeLog   13 Jun 2002 08:35:48 -0000
@@ -1,5 +1,12 @@
 2002-05-03  Paolo Bonzini  <address@hidden>
 
+       * 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  <address@hidden>
+
        * automake.in (required_targets): Add the pdf and pdf-am targets.
        (initialize_per_input): Likewise.
        (scan_texinfo_file): Add pdf to @clean_suffixes.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1302
diff -u -r1.1302 automake.in
--- automake.in 13 Jun 2002 08:09:28 -0000      1.1302
+++ automake.in 13 Jun 2002 08:35:49 -0000
@@ -188,7 +188,7 @@
 # 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 @@
     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
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.278
diff -u -r1.278 automake.texi
--- automake.texi       11 Jun 2002 09:12:43 -0000      1.278
+++ automake.texi       13 Jun 2002 08:35:50 -0000
@@ -4487,9 +4487,9 @@
 
 @itemize @bullet
 @item
-The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{COPYING},
address@hidden, 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

-- 
Alexandre Duret-Lutz