From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 24 Aug 2015 08:30:42 +0000 (+0900)
Subject: xgettext: Replace PACKAGE placeholder if possible
X-Git-Tag: v0.19.6~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a08add578ab68fdbbddb218043dc39e23499454;p=thirdparty%2Fgettext.git

xgettext: Replace PACKAGE placeholder if possible

* xgettext.c (construct_header): Replace PACKAGE placeholder in
the header comment.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6ffa742a3..d5c5491fc 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-24  Daiki Ueno  <ueno@gnu.org>
+
+	* xgettext.c (construct_header): Replace PACKAGE placeholder in
+	the header comment.
+
 2015-06-11  Philip Withnall  <philip.withnall@collabora.co.uk>
 
 	xgettext: add support for AppData files
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index be2aa6cd2..2f34057ba 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -3619,9 +3619,10 @@ Content-Transfer-Encoding: 8bit\n",
       comment = xasprintf ("\
 SOME DESCRIPTIVE TITLE.\n\
 %s\
-This file is distributed under the same license as the PACKAGE package.\n\
+This file is distributed under the same license as the %s package.\n\
 FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n",
-                         copyright_comment);
+                           copyright_comment,
+                           package_name != NULL ? package_name : "PACKAGE");
       free (copyright_comment);
     }
   else