diff options
| author | Bruno Haible <bruno@clisp.org> | 2007-10-18 15:22:00 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:19 +0200 |
| commit | 5fa250bf3af0026839c386440f908f0784792814 (patch) | |
| tree | a0ae61a0df58447bc7cfcebdd3736cee95511a28 /gettext-runtime/po | |
| parent | 9b794b26308de53916cd904c80c7839721109be9 (diff) | |
| download | external_gettext-5fa250bf3af0026839c386440f908f0784792814.zip external_gettext-5fa250bf3af0026839c386440f908f0784792814.tar.gz external_gettext-5fa250bf3af0026839c386440f908f0784792814.tar.bz2 | |
Don't pass --package-name option to xgettext older than 0.16.2.
Diffstat (limited to 'gettext-runtime/po')
| -rw-r--r-- | gettext-runtime/po/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/po/Makefile.in.in | 25 |
2 files changed, 23 insertions, 7 deletions
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index 88b45d0..32089a4 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,8 @@ +2007-10-18 Bruno Haible <bruno@clisp.org> + + * Makefile.in.in ($(DOMAIN).pot-update): Don't pass the package name + and version to xgettext if the xgettext version is < 0.16.2. + 2007-10-12 Bruno Haible <bruno@clisp.org> * nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>. diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index d229c0d..372fb9b 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -148,13 +148,24 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed else \ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --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" + 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) \ + --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) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ |