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 6ffa742a3e7c0219d150c6c0f6429d41d60231ea..d5c5491fcfbe11629afaf4bd2a7d93eda620d9ab 100644 (file)
--- 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 be2aa6cd2bd862c3b2a6f2e5778921c99dfb6507..2f34057ba362793e46837828cbac45de105fbac4 100644 (file)
--- 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