bug-automake
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Support for multiple licenses.


From: Sergey Poznyakoff
Subject: [PATCH] Support for multiple licenses.
Date: Wed, 11 Jun 2003 17:49:43 +0300

Hello,

When copying required files, automake in its current form supposes
that the package being 'automade' falls under the terms of only
one license (either GPL or Lesser GPL). However, some packages
are distributed under the terms of the two licenses. For example,
GNU Mailutils package distributes its libraries under LGPL, and
binary programs under GPL. Thus, in Mailutils we need both COPYING
and COPYING.LIB to be distributed. 

I propose to add a new switch 'multiple-licenses' which would tell
automake that the package needs both files. Then, if one sets in the
Makefile.am

AUTOMAKE-OPTIONS = gnu multiple-licenses

and copies COPYING.LIB to the root directory of his package, then
automake will add both COPYING and COPYING.LIB to the DIST_COMMON
variable of the resulting Makefile.in.

Attached is the patch that implements this idea.

Regards,
Sergey

Index: automake.in
===================================================================
RCS file: /cvsroot/automake/automake/automake.in,v
retrieving revision 1.1437
diff -p -u -r1.1437 automake.in
--- automake.in 26 Feb 2003 20:53:48 -0000      1.1437
+++ automake.in 11 Jun 2003 14:25:16 -0000
@@ -1749,7 +1749,7 @@ sub process_option_list
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
             || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
             || $_ eq 'no-exeext' || $_ eq 'no-define'
-            || $_ eq 'std-options')
+            || $_ eq 'std-options' || $_ eq 'multiple-licenses')
        {
          # Explicitly recognize these.
        }
@@ -5496,7 +5496,17 @@ sub check_gnu_standards
       my $license = 'COPYING';
       foreach (qw /COPYING.LIB COPYING.LESSER/)
        {
-         $license = $_ if -f $_;
+          if (-f $_)
+            {
+              if (defined $options{'multiple-licenses'})
+                {
+                  require_file ("$am_file.am", GNU, $_);
+                }
+              else
+                {
+                  $license = $_;
+                }
+            }
        }
       require_file ("$am_file.am", GNU, $license,
                    qw/INSTALL NEWS README AUTHORS ChangeLog/);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]