Pass the package name and version to xgettext.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 593649cface171fa01b15f33f27004eacbcedf90..c108031c7985fa1493727971f4cccf417894fca1 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17  Bruno Haible  <bruno@clisp.org>
+
+       * hello-*/po/Makefile.am ($(DOMAIN).pot-update): Pass the package name
+       and version to xgettext.
+
 2007-10-17  Bruno Haible  <bruno@clisp.org>
 
        * hello-java/po/Makefile.am (stamp-po): Test $(PROPERTIESFILES), not

diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index b1d392f3a6d0ad02bfc1a657466e41d47afb733f..ee1199c5d8e18199708bae235c649005cab93c28 100644 (file)
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -116,6 +116,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -124,6 +129,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index ccce358790f2506f1e5cc38cc81ba93aad5b36d3..10e2889099bbb4d55f98982c552de8ce1393e887 100644 (file)
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -123,6 +123,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -131,6 +136,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 4d2d37f39b9348c250b367948a3e9f7cb590ae7f..d9d5cbdbddc066c02c68b699704dd9bff804eaae 100644 (file)
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
index dfa09e7710d6f046d01e6139053756d28b30d547..bede90a1894d050f9170b8c6bd3744cad4c46bba 100644 (file)
--- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
@@ -105,6 +105,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -113,6 +118,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am
index dfa09e7710d6f046d01e6139053756d28b30d547..bede90a1894d050f9170b8c6bd3744cad4c46bba 100644 (file)
--- a/gettext-tools/examples/hello-csharp/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/po/Makefile.am
@@ -105,6 +105,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -113,6 +118,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 90549819259c9db41380a9cbd710e88b80e20fc5..91689a9c2b4a2a96aa23430a6869106e688d4849 100644 (file)
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 387157cb2cdbca79a29edcfd3d067164f914e3a1..4a99f6e2d770975e0ae3b149751f6c4da34b312b 100644 (file)
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am
index b10beed01cbbfd4fd353ed654d466c34d35c7daf..824337d57daceee75625a42ef02f0b4e08936f86 100644 (file)
--- a/gettext-tools/examples/hello-java-awt/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am
@@ -103,6 +103,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -111,6 +116,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am
index b10beed01cbbfd4fd353ed654d466c34d35c7daf..824337d57daceee75625a42ef02f0b4e08936f86 100644 (file)
--- a/gettext-tools/examples/hello-java-swing/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am
@@ -103,6 +103,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -111,6 +116,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am
index 0f5be05769828d8bb365e34335eb5819a3695217..6cb4c4bfeaeaeea223f85efab8863844189bb807 100644 (file)
--- a/gettext-tools/examples/hello-java/po/Makefile.am
+++ b/gettext-tools/examples/hello-java/po/Makefile.am
@@ -103,6 +103,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -111,6 +116,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index 2addf3adc51ff02b1d5ac2fc8395f216881d25ca..24dc0820ccc7ba781676e9c1bf574bc9e4bd20f6 100644 (file)
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index 5c713f0c3fd57898894e132b2dfdf87a8467b505..1dbbf47f147b7e1ff6aa1266a9afd22258f17756 100644 (file)
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index 43088c1089f684e1b43e85252db604b9ad761e94..ab053a0a4beba158ab219e75403d205da9dba2ab 100644 (file)
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -127,6 +127,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -135,6 +140,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index b0c7d1858e4de03214eaa4f0241a45e85d9a2e46..c5fa148797158219f11ea0c63a76c97dea09efbb 100644 (file)
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index c2a47d303a1a8f2bc6f82b9d926533c875723b6c..55605a6fa52d0a8f256428881b93fdac8159667c 100644 (file)
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index fb43065cd3dd65e56b517e8479f37aa52f47cb9b..d6f90bac55afdf3254bc3d98b5d0842288321b4c 100644 (file)
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 21a1c2ef53498978651c279de5ecb55051b36036..6e5372fd256c4f5fc13871e8bec8ab009ca2ce42 100644 (file)
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
index b13db5db88340e11631f3dbacb348b07ecb4d44b..876ab3b1b0dba4090f27882bb21e55fbe087605c 100644 (file)
--- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
@@ -103,6 +103,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -111,6 +116,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am
index b13db5db88340e11631f3dbacb348b07ecb4d44b..876ab3b1b0dba4090f27882bb21e55fbe087605c 100644 (file)
--- a/gettext-tools/examples/hello-tcl/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl/po/Makefile.am
@@ -103,6 +103,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -111,6 +116,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index 28947ba6459edca4eb8b4f76e7aa615d37565a1e..ce4abd285b56b96dc4df99b32e1a2b7af1defe26 100644 (file)
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -117,6 +117,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_DEPS) 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)'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
@@ -125,6 +130,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --package-name="$${package_gnu}$(PACKAGE)" \
+         --package-version='$(VERSION)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          $(POTFILES)
        test ! -f $(DOMAIN).po || { \