update-copyright: you may specify a max. line length other than 72

* build-aux/update-copyright: Honor $UPDATE_COPYRIGHT_MAX_LINE_LENGTH.

diff --git a/ChangeLog b/ChangeLog
index 4ecab427e4d61e9b21a2e6a26c3eb959e6084df3..a5c7e46267af1015f581d4d141054200442d113b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-12-28  Jim Meyering  <meyering@redhat.com>
 
+       update-copyright: you may specify a max. line length other than 72
+       * build-aux/update-copyright: Honor $UPDATE_COPYRIGHT_MAX_LINE_LENGTH.
+
        maint: use consistent FSF copyright line syntax
        * lib/posixtm.c: Add missing comma in FSF copyright line.
        * lib/posixtm.h: Likewise.

diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index f54176131672c15693cb6d6c819610ccb0a45359..363c6a6adfb3ed2c5903e25f18f3351963ab9a4e 100755 (executable)
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
     if 0;
 # Update an FSF copyright year list to include the current year.
 
-my $VERSION = '2009-10-30.15:57'; # UTC
+my $VERSION = '2009-12-28.11:09'; # UTC
 
 # Copyright (C) 2009 Free Software Foundation, Inc.
 #
@@ -114,6 +114,8 @@ my $VERSION = '2009-10-30.15:57'; # UTC
 #      are expanded instead.
 #   3. For testing purposes, you can set the assumed current year in
 #      UPDATE_COPYRIGHT_YEAR.
+#   4. The default maximum line length for a copyright line is 72.
+#      Set UPDATE_COPYRIGHT_MAX_LINE_LENGTH to use a different length.
 
 use strict;
 use warnings;
@@ -122,7 +124,10 @@ my $copyright_re = 'Copyright';
 my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
 my $holder = 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
-my $margin = 72;
+my $margin = $ENV{UPDATE_COPYRIGHT_MAX_LINE_LENGTH};
+!$margin || $margin !~ m/^\d+$/
+  and $margin = 72;
+
 my $tab_width = 8;
 
 my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};