From: Eric Blake <eblake@redhat.com>
Date: Mon, 22 Feb 2010 22:28:38 +0000 (-0700)
Subject: bootstrap: support non-FSF copyright holder
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca1a746ebe67827fd1fcbac28172879a649cefd;p=pspp

bootstrap: support non-FSF copyright holder

Allow non-FSF projects, like libvirt, to make full use of bootstrap.

* build-aux/bootstrap (COPYRIGHT_HOLDER, with_gettext): Allow
bootstrap.conf override of COPYRIGHT_HOLDER.
(MSGID_BUGS_ADDRESS): Allow URL rather than email.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 2c6dfecca6..ddb7216d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-02-22  Eric Blake  <eblake@redhat.com>
 
+	bootstrap: support non-FSF copyright holder
+	* build-aux/bootstrap (COPYRIGHT_HOLDER, with_gettext): Allow
+	bootstrap.conf override of COPYRIGHT_HOLDER.
+	(MSGID_BUGS_ADDRESS): Allow URL rather than email.
+
 	bootstrap: interoperate with gettext 0.14.1
 	* build-aux/bootstrap (slurp): Fix typo when using older gettext.
 
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d37567c279..be96444fdd 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -133,7 +133,8 @@ XGETTEXT_OPTIONS='\\\
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
-# Package bug report address for gettext files
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
 MSGID_BUGS_ADDRESS=bug-$package@gnu.org
 
 # Files we don't want to import.
@@ -786,7 +787,8 @@ if test $with_gettext = yes; then
   rm -f po/Makevars
   sed '
     /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
+    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\