automake-patches
[Top][All Lists]
Advanced

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

patch 1 - don't require COPYING if LGPL used


From: Bonzini
Subject: patch 1 - don't require COPYING if LGPL used
Date: Wed, 12 Jun 2002 08:38:22 -0400
User-agent: Mutt/1.3.25i

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

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

2002-05-03      Paolo Bonzini  (address@hidden)

         * automake.in (check_gnu_standards): accept in --gnu
         mode that COPYING is absent if one of COPYING.LESSER or
         COPYING.LIB is there.
         (common_files): Automatically distribute COPYING.LESSER
         and shtool
         * automake.texi (Gnits): document this.


diff -rpC3 automake.old/automake.in automake.copying/automake.in
*** automake.old/automake.in    Fri May  3 08:17:22 2002
--- automake.copying/automake.in        Wed Jun 12 08:28:39 2002
*************** my @libtool_sometimes = qw(ltconfig ltcf
*** 188,196 ****
  # DISTFILES.
  my @common_files =
      (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
!       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
        py-compile texinfo.tex ylwrap),
       @libtool_files, @libtool_sometimes);
--- 188,196 ----
  # DISTFILES.
  my @common_files =
      (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
!       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 shtool
        install-sh libversion.in mdate-sh missing mkinstalldirs
        py-compile texinfo.tex ylwrap),
       @libtool_files, @libtool_sometimes);
*************** sub check_gnu_standards
*** 4815,4822 ****
      if ($relative_dir eq '.')
      {
        # In top level (or only) directory.
!       require_file ("$am_file.am", GNU,
!                     qw(INSTALL NEWS README COPYING AUTHORS ChangeLog));
      }
  
      if ($strictness >= GNU
--- 4815,4831 ----
      if ($relative_dir eq '.')
      {
        # In top level (or only) directory.
!       if (-f "COPYING.LESSER")
!       {
!           require_file ("$am_file.am", GNU,
!                         qw(INSTALL NEWS README COPYING.LESSER AUTHORS 
ChangeLog));
!       } elsif (-f "COPYING.LIB") {
!           require_file ("$am_file.am", GNU,
!                         qw(INSTALL NEWS README COPYING.LIB AUTHORS 
ChangeLog));
!       } else {
!           require_file ("$am_file.am", GNU,
!                         qw(INSTALL NEWS README COPYING AUTHORS ChangeLog));
!       }
      }
  
      if ($strictness >= GNU
diff -rpC3 automake.old/automake.texi automake.copying/automake.texi
*** automake.old/automake.texi  Fri May  3 08:17:22 2002
--- automake.copying/automake.texi      Wed Jun 12 08:28:39 2002
*************** Gnits
*** 4507,4515 ****
  
  @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.
  
  @item
  The options @samp{no-installman} and @samp{no-installinfo} are
--- 4507,4515 ----
  
  @itemize @bullet
  @item
! The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{AUTHORS},
! and @file{ChangeLog}, plus one of @file{COPYING.LIB}, @file{COPYING.LESSER}
! and @file{COPYING}, are required at the topmost directory of the package.
  
  @item
  The options @samp{no-installman} and @samp{no-installinfo} are




reply via email to

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