Pass the package name and version to xgettext.

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 9a61b5e0912578010b8f692df014a0e3b3ef13f1..134300c212c26f4ba9658087132a701140e40469 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in ($(DOMAIN).pot-update): Pass the package name and
+       version to xgettext.
+
 2007-09-15  Bruno Haible  <bruno@clisp.org>
 
        * sk.po: Update from Marcel Telka <marcel@telka.sk>.

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 42f023753d6698b208dceb09e9298e42312088ab..b5d3a7ad1d770e67cf20fade50fa65655f48256b 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -138,6 +138,11 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v '^libtool:' >/dev/null; then
+         package_gnu='GNU '; \
+       else \
+         package_gnu=''; \
+       fi; \
        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -147,6 +152,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --files-from=$(srcdir)/POTFILES.in \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}@PACKAGE@" \
+         --package-version='@VERSION@' \
          --msgid-bugs-address="$$msgid_bugs_address"
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index fb140ea5e860d1c6cfea80dc5ae2d744e9e0668b..aa5ce7c9239fa97f14bdfe39098d565ecc9f6103 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in ($(DOMAIN).pot-update): Pass the package name and
+       version to xgettext.
+
 2007-09-19  Bruno Haible  <bruno@clisp.org>
 
        * eu.po: New file, from Piarres Beobide <pi@beobide.net>.

diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 42f023753d6698b208dceb09e9298e42312088ab..b5d3a7ad1d770e67cf20fade50fa65655f48256b 100644 (file)
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -138,6 +138,11 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v '^libtool:' >/dev/null; then
+         package_gnu='GNU '; \
+       else \
+         package_gnu=''; \
+       fi; \
        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -147,6 +152,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --files-from=$(srcdir)/POTFILES.in \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}@PACKAGE@" \
+         --package-version='@VERSION@' \
          --msgid-bugs-address="$$msgid_bugs_address"
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \