mirror of
https://git.zap.org.au/git/trader.git
synced 2024-09-01 17:14:15 -04:00
Update to GNU Gettext 0.19.5
This commit is contained in:
parent
f16f78a509
commit
25d233c7fb
@ -1,15 +1,13 @@
|
|||||||
# Makefile for PO directory in any package using GNU gettext.
|
# Makefile for PO directory in any package using GNU gettext.
|
||||||
# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
||||||
#
|
#
|
||||||
# This file can be copied and used freely without restrictions. It can
|
# Copying and distribution of this file, with or without modification,
|
||||||
# be used in projects which are not available under the GNU General Public
|
# are permitted in any medium without royalty provided the copyright
|
||||||
# License but which still want to provide support for the GNU gettext
|
# notice and this notice are preserved. This file is offered as-is,
|
||||||
# functionality.
|
# without any warranty.
|
||||||
# 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.18.3
|
# Origin: gettext-0.19.5
|
||||||
GETTEXT_MACRO_VERSION = 0.18
|
GETTEXT_MACRO_VERSION = 0.19
|
||||||
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
@ -77,6 +75,16 @@ POTFILES = \
|
|||||||
|
|
||||||
CATALOGS = @CATALOGS@
|
CATALOGS = @CATALOGS@
|
||||||
|
|
||||||
|
POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
|
||||||
|
POFILESDEPS_yes = $(POFILESDEPS_)
|
||||||
|
POFILESDEPS_no =
|
||||||
|
POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
|
||||||
|
|
||||||
|
DISTFILESDEPS_ = update-po
|
||||||
|
DISTFILESDEPS_yes = $(DISTFILESDEPS_)
|
||||||
|
DISTFILESDEPS_no =
|
||||||
|
DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
|
||||||
|
|
||||||
# Makevars gets inserted here. (Don't remove this line!)
|
# Makevars gets inserted here. (Don't remove this line!)
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@ -143,15 +151,25 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
|
|||||||
# heuristic whether some file in the top level directory mentions "GNU xyz".
|
# heuristic whether some file in the top level directory mentions "GNU xyz".
|
||||||
# If GNU 'find' is available, we avoid grepping through monster files.
|
# If GNU 'find' is available, we avoid grepping through monster files.
|
||||||
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
||||||
|
package_gnu="$(PACKAGE_GNU)"; \
|
||||||
|
test -n "$$package_gnu" || { \
|
||||||
if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
|
if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
|
||||||
LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
|
LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
|
||||||
|
-size -10000000c -exec grep 'GNU @PACKAGE@' \
|
||||||
|
/dev/null '{}' ';' 2>/dev/null; \
|
||||||
else \
|
else \
|
||||||
LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
|
LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
|
||||||
fi; \
|
fi; \
|
||||||
} | grep -v 'libtool:' >/dev/null; then \
|
} | grep -v 'libtool:' >/dev/null; then \
|
||||||
package_gnu='GNU '; \
|
package_gnu=yes; \
|
||||||
else \
|
else \
|
||||||
package_gnu=''; \
|
package_gnu=no; \
|
||||||
|
fi; \
|
||||||
|
}; \
|
||||||
|
if test "$$package_gnu" = "yes"; then \
|
||||||
|
package_prefix='GNU '; \
|
||||||
|
else \
|
||||||
|
package_prefix=''; \
|
||||||
fi; \
|
fi; \
|
||||||
if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
|
if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
|
||||||
msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
|
msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
|
||||||
@ -171,7 +189,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
|||||||
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
|
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
|
||||||
--files-from=$(srcdir)/POTFILES.in \
|
--files-from=$(srcdir)/POTFILES.in \
|
||||||
--copyright-holder='$(COPYRIGHT_HOLDER)' \
|
--copyright-holder='$(COPYRIGHT_HOLDER)' \
|
||||||
--package-name="$${package_gnu}@PACKAGE@" \
|
--package-name="$${package_prefix}@PACKAGE@" \
|
||||||
--package-version='@VERSION@' \
|
--package-version='@VERSION@' \
|
||||||
--msgid-bugs-address="$$msgid_bugs_address" \
|
--msgid-bugs-address="$$msgid_bugs_address" \
|
||||||
;; \
|
;; \
|
||||||
@ -199,13 +217,14 @@ $(srcdir)/$(DOMAIN).pot:
|
|||||||
|
|
||||||
# This target rebuilds a PO file if $(DOMAIN).pot has changed.
|
# This target rebuilds a PO file if $(DOMAIN).pot has changed.
|
||||||
# Note that a PO file is not touched if it doesn't need to be changed.
|
# Note that a PO file is not touched if it doesn't need to be changed.
|
||||||
$(POFILES): $(srcdir)/$(DOMAIN).pot
|
$(POFILES): $(POFILESDEPS)
|
||||||
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
||||||
if test -f "$(srcdir)/$${lang}.po"; then \
|
if test -f "$(srcdir)/$${lang}.po"; then \
|
||||||
|
test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
|
||||||
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||||
echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
|
echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
|
||||||
cd $(srcdir) \
|
cd $(srcdir) \
|
||||||
&& { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
|
&& { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
|
||||||
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
|
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
|
||||||
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
|
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
|
||||||
*) \
|
*) \
|
||||||
@ -362,7 +381,7 @@ maintainer-clean: distclean
|
|||||||
|
|
||||||
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||||
dist distdir:
|
dist distdir:
|
||||||
$(MAKE) update-po
|
test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
|
||||||
@$(MAKE) dist2
|
@$(MAKE) dist2
|
||||||
# This is a separate target because 'update-po' must be executed before.
|
# This is a separate target because 'update-po' must be executed before.
|
||||||
dist2: stamp-po $(DISTFILES)
|
dist2: stamp-po $(DISTFILES)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
# This file, Rules-quot, can be copied and used freely without restrictions.
|
||||||
# Special Makefile rules for English message catalogs with quotation marks.
|
# Special Makefile rules for English message catalogs with quotation marks.
|
||||||
|
|
||||||
DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
|
DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
|
||||||
@ -20,7 +21,17 @@ en@boldquot.po-update: en@boldquot.po-update-en
|
|||||||
ll=`echo $$lang | sed -e 's/@.*//'`; \
|
ll=`echo $$lang | sed -e 's/@.*//'`; \
|
||||||
LC_ALL=C; export LC_ALL; \
|
LC_ALL=C; export LC_ALL; \
|
||||||
cd $(srcdir); \
|
cd $(srcdir); \
|
||||||
if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
|
if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
|
||||||
|
| $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
|
||||||
|
{ case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
|
||||||
|
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
|
||||||
|
$(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
|
||||||
|
;; \
|
||||||
|
*) \
|
||||||
|
$(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
|
||||||
|
;; \
|
||||||
|
esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
|
||||||
|
; then \
|
||||||
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
||||||
rm -f $$tmpdir/$$lang.new.po; \
|
rm -f $$tmpdir/$$lang.new.po; \
|
||||||
else \
|
else \
|
||||||
|
Loading…
Reference in New Issue
Block a user