build-aux/update-copyright: Support UPDATE_COPYRIGHT_HOLDER environment variable.

diff --git a/ChangeLog b/ChangeLog
index 9169a7434282f28fb473643ac1c532485c51a980..629336098cac6739cddad389443cf311fad347de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02  Simon Josefsson  <simon@josefsson.org>
+
+       * build-aux/update-copyright: Support UPDATE_COPYRIGHT_HOLDER
+       environment variable.
+
 2011-01-02  Bruno Haible  <bruno@clisp.org>
 
        unigbrk: Avoid gcc warnings.

diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 51546cca78f7c8f3de62d19d60248510014629cb..db59cc7f1599ab4ca40202c6179e0dad2aa0c4de 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-12-28.11:09'; # UTC
+my $VERSION = '2011-01-02.19:00'; # UTC
 
 # Copyright (C) 2009-2011 Free Software Foundation, Inc.
 #
@@ -122,7 +122,8 @@ use warnings;
 
 my $copyright_re = 'Copyright';
 my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
-my $holder = 'Free Software Foundation, Inc.';
+my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
+$holder ||= 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
 my $margin = $ENV{UPDATE_COPYRIGHT_MAX_LINE_LENGTH};
 !$margin || $margin !~ m/^\d+$/
@@ -252,7 +253,7 @@ if (defined $stmt_re)
   }
 else
   {
-    print STDERR "$ARGV: warning: FSF copyright statement not found\n";
+    print STDERR "$ARGV: warning: copyright statement not found\n";
   }
 
 # Local variables: