diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-02-07 12:05:59 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:09 +0200 |
| commit | 4502193d0407adba5a7de38fd913f0b0305dc248 (patch) | |
| tree | bd4100bc2f9885be0de3f1a65b9491b79192e970 /gettext-tools | |
| parent | 67e44927ecc9d8fa2e8b9e733f4fd07e18d18eb9 (diff) | |
| download | external_gettext-4502193d0407adba5a7de38fd913f0b0305dc248.zip external_gettext-4502193d0407adba5a7de38fd913f0b0305dc248.tar.gz external_gettext-4502193d0407adba5a7de38fd913f0b0305dc248.tar.bz2 | |
Use PACKAGE_BUGREPORT if MSGID_BUGS_ADDRESS is empty.
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/po/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-tools/po/Makefile.in.in | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index fa745fa..259ee46 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,10 @@ +2005-02-06 Bruno Haible <bruno@clisp.org> + + * Makefile.in.in (PACKAGE_BUGREPORT): New variable. + ($(DOMAIN).pot-update): If MSGID_BUGS_ADDRESS is empty and + PACKAGE_BUGREPORT is available, use the latter. + Reported by Simon Josefsson <jas@extundo.com>. + 2005-01-26 Bruno Haible <bruno@clisp.org> * ru.po: Update from Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>. diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index 53efc5e..76516c1 100644 --- a/gettext-tools/po/Makefile.in.in +++ b/gettext-tools/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu> +# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,10 +8,11 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.14 +# Origin: gettext-0.14.2 PACKAGE = @PACKAGE@ VERSION = @VERSION@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ SHELL = /bin/sh @SET_MAKE@ @@ -100,11 +101,16 @@ 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 test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + 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)' \ - --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' + --msgid-bugs-address="$$msgid_bugs_address" test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ |