From 0850a9e4af43a28cd5da81e2ea61cdad00d1de95 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Oct 2007 19:04:22 +0000 Subject: [PATCH] Consider the XGETTEXT_EXTRA_OPTIONS variable. --- gettext-runtime/po/ChangeLog | 5 +++++ gettext-runtime/po/Makefile.in.in | 4 ++-- gettext-tools/po/ChangeLog | 5 +++++ gettext-tools/po/Makefile.in.in | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index c02be2a55..e1f53733d 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,8 @@ +2007-10-28 Bruno Haible + + * Makefile.in.in ($(DOMAIN).pot-update): Consider the + XGETTEXT_EXTRA_OPTIONS variable. + 2007-10-28 Bruno Haible * Makefile.in.in (GETTEXT_MACRO_VERSION): Bump to 0.17. diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index da3a6aac0..fecf500f3 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -151,14 +151,14 @@ $(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) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ *) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_gnu}@PACKAGE@" \ diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index a03a77637..39fe7a39f 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,8 @@ +2007-10-28 Bruno Haible + + * Makefile.in.in ($(DOMAIN).pot-update): Consider the + XGETTEXT_EXTRA_OPTIONS variable. + 2007-10-28 Bruno Haible * Makefile.in.in (GETTEXT_MACRO_VERSION): Bump to 0.17. diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index da3a6aac0..fecf500f3 100644 --- a/gettext-tools/po/Makefile.in.in +++ b/gettext-tools/po/Makefile.in.in @@ -151,14 +151,14 @@ $(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) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ *) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_gnu}@PACKAGE@" \ -- 2.47.3