po: Make it possible to override xgettext options from Makefile.in.in.

* gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): List the
XGETTEXT_OPTIONS and the XGETTEXT_EXTRA_OPTIONS after all other options.
* gettext-tools/examples/po/Makefile.am ($(DOMAIN).pot-update): Likewise.
* gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update):
Likewise.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
($(DOMAIN).pot-update): Likewise.
* NEWS: Mention the change.
* gettext-tools/doc/gettext.texi (po/Makevars): Fix typo.

diff --git a/NEWS b/NEWS
index d80445b6600489056a54e51968c9682e779fe3a4..18a1d8c20840f41803ada4c3be7567def6466160 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Version 0.20 - May 2019
+
 * Support for reproducible builds:
   - msgfmt now eliminates the POT-Creation-Date header field from .mo files.
 
@@ -9,6 +11,8 @@
     for use by msgfmt only.  This option saves processing time, in particular
     by omitting fuzzy matching that is not useful in this situation.
   - The .pot file in a 'po' directory is now erased by "make maintainer-clean".
+  - It is now possible to override xgettext options from the po/Makefile.in.in
+    through options in XGETTEXT_OPTIONS (declared in po/Makevars).
   - The --intl option of the gettextize program (deprecated since 2010) is
     no longer available. Instead of including the intl sources in your package,
     we suggest making the libintl library an optional prerequisite of your

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 5086696efa8a81462cbdbe6b2616463192b3410d..fdb6ad358813f9380e537fb5e0eca716433d282d 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -195,19 +195,21 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --files-from=$(srcdir)/POTFILES.in \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --files-from=$(srcdir)/POTFILES.in \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}@PACKAGE@" \
              --package-version='@VERSION@' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
            ;; \
        esac
        test ! -f $(DOMAIN).po || { \

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 851f82ce5307f4038f41c8989536fd693bc53c02..f9b40441fef31a3680a30e6329b1c665b780358d 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -7927,7 +7927,7 @@ Only packages which have multiple @file{po/} directories at different
 locations need to adjust the three first variables defined in
 @file{Makevars}.
 
-As an alternative to the @code{XGETTEXT_OPTIONS} variables, it is also
+As an alternative to the @code{XGETTEXT_OPTIONS} variable, it is also
 possible to specify @code{xgettext} options through the
 @code{AM_XGETTEXT_OPTION} autoconf macro.  See @ref{AM_XGETTEXT_OPTION}.
 

diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index cf1067ebecb2168d4c423d7640595efc32b0e118..e1eba009b67d6692a4311bb0cf30665a3eac3e78 100644 (file)
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -184,18 +184,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index 61658fcc5f730b4fafde5cf71639fd31f25fd3eb..22373f626695e7de472760255a813c5971ebbf32 100644 (file)
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -187,18 +187,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 2d012b1842a2e2962519ffae0326dc05836cf3c9..eeab8354d5589eed94cc2c9bd2a54353e3a1d975 100644 (file)
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
index 24ed7fdcbdc13c5fe8158fab9efb596ef979f16e..ee846dad3d7b2f9f2d783ea897211fa52f2d856a 100644 (file)
--- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
@@ -165,18 +165,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am
index 24ed7fdcbdc13c5fe8158fab9efb596ef979f16e..ee846dad3d7b2f9f2d783ea897211fa52f2d856a 100644 (file)
--- a/gettext-tools/examples/hello-csharp/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/po/Makefile.am
@@ -165,18 +165,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 960c773e62bdacb5ecc4bbd031060ae06b26658a..a41f4783e5e199aeb9d39300a00b8126828179eb 100644 (file)
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 793bddd78d6602d65b582d3fbde92fcfaf23ac3b..166333c9f43dd8e8024e21a9dd6b776014036d11 100644 (file)
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am
index ae880a8337731eefc80e0c70e232fa7a2b010fe5..291a348be48f2305bf8950098c222a4862aa6d93 100644 (file)
--- a/gettext-tools/examples/hello-java-awt/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
index ae880a8337731eefc80e0c70e232fa7a2b010fe5..291a348be48f2305bf8950098c222a4862aa6d93 100644 (file)
--- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am
index ae880a8337731eefc80e0c70e232fa7a2b010fe5..291a348be48f2305bf8950098c222a4862aa6d93 100644 (file)
--- a/gettext-tools/examples/hello-java-swing/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am
index ae880a8337731eefc80e0c70e232fa7a2b010fe5..291a348be48f2305bf8950098c222a4862aa6d93 100644 (file)
--- a/gettext-tools/examples/hello-java/po/Makefile.am
+++ b/gettext-tools/examples/hello-java/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index 424f335e3d004ff7f5af2fb4e1df0b5b233fec5e..0e7c4077f588dcd9b17520925af64c751aae49d4 100644 (file)
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
index 8c9113b0ac16d8f80d3d8a350eb6756c74b9aeed..2e80882e932bd38e9b7711cf029ecd197621c4a0 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
@@ -136,18 +136,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE_NAME)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index b79d1afbe71b0c6552c3cd0857ae1a5c501e5071..403078013f56c8dc9f854525251a95f890e10c60 100644 (file)
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index 0809acf05297593d4123be2145cb6c3acb13b920..a2d5fac3d5b78b2f61b2629d04a4410e0d1ebf76 100644 (file)
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -191,18 +191,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index 4eeee736093a18361e2f0d6f1bdb279e22aae794..68fc14379b90e3a65e3e3c515d66d9c5316ae4c9 100644 (file)
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index 41d41398ec5393f60dd6e9a2f3bf80a80743dfb2..619196f063399de762d0f6cadba7b2341c443f26 100644 (file)
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index bc006d5c56a74f6178377858979954ab18fb7f75..421ecda86feb8801e235e764120080e75ea67505 100644 (file)
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 5d20248163badc33d9aed044575898307ef71cf6..4330f76b6e0a72baf295a1c361d90dddcd5b8b9a 100644 (file)
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
index bf3225611c7ec79d4df845bce8ae25929e1f4949..7a06d67d85aabde5af947b5cdedeecc049769a2c 100644 (file)
--- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am
index bf3225611c7ec79d4df845bce8ae25929e1f4949..7a06d67d85aabde5af947b5cdedeecc049769a2c 100644 (file)
--- a/gettext-tools/examples/hello-tcl/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl/po/Makefile.am
@@ -162,18 +162,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index 2456e768ae41ac37c7d7f85e7b40d23033588b18..eca5b75683d6b3ba68c8ae2c33f55c02a61387b8 100644 (file)
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -181,18 +181,20 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
          *) \
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --add-comments=TRANSLATORS: \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
              --package-name="$${package_prefix}$(PACKAGE)" \
              --package-version='$(VERSION)' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+             $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
              $(POTFILES) \
            ;; \
        esac

diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index b4e32d6015d416aaf80d8863aa73f7c8f6a14e37..a91a2a76e9b02a443fd4a4cee50e17559169489b 100644 (file)
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/examples/po subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2007, 2009, 2014, 2018 Free Software Foundation,
+## Copyright (C) 1995-1998, 2000-2007, 2009, 2014, 2018-2019 Free Software Foundation,
 ## Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
@@ -206,10 +206,11 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) remove-potcdate.sed
          msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
        fi; \
        $(XGETTEXT) --default-domain=$(DOMAIN) \
-         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+         --add-comments=TRANSLATORS: \
          --copyright-holder='$(COPYRIGHT_HOLDER)' \
          --msgid-bugs-address="$$msgid_bugs_address" \
          --directory='$(srcdir)' \
+         $(XGETTEXT_OPTIONS) \
          $(SMALLPOTS)
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \