Skip to content

Commit

Permalink
Use the newest gettext release.
Browse files Browse the repository at this point in the history
* po/Makefile.in.in: Upgrade to gettext-0.21, keeping the change
	2019-01-27  Bruno Haible  <bruno@clisp.org>
	Accommodate a shell that is not in /bin/sh.
	* po/Makefile.in.in (SHELL): Use the value found by configure.
  • Loading branch information
bhaible committed May 15, 2022
1 parent 2320d92 commit 4b9c27b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
8 changes: 8 additions & 0 deletions po/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2022-05-15 Bruno Haible <bruno@clisp.org>

Use the newest gettext release.
* Makefile.in.in: Upgrade to gettext-0.21, keeping the change
2019-01-27 Bruno Haible <bruno@clisp.org>
Accommodate a shell that is not in /bin/sh.
* Makefile.in.in (SHELL): Use the value found by configure.

2022-05-15 Bruno Haible <bruno@clisp.org>

Update translations.
Expand Down
19 changes: 13 additions & 6 deletions po/Makefile.in.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Makefile for PO directory in any package using GNU gettext.
# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
# Copyright (C) 2000-2019 Free Software Foundation, Inc.
# Copyright (C) 2000-2020 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.
#
# Origin: gettext-0.20
# Origin: gettext-0.21
GETTEXT_MACRO_VERSION = 0.20

PACKAGE = @PACKAGE@
Expand Down Expand Up @@ -90,6 +90,9 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))

# Makevars gets inserted here. (Don't remove this line!)

all: all-@USE_NLS@


.SUFFIXES:
.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update

Expand All @@ -107,7 +110,8 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
# the .pot file. This eliminates the need to update the .po files when the
# .pot file has changed, which would be troublesome if the .po files are put
# under version control.
.po.gmo: $(srcdir)/$(DOMAIN).pot
$(GMOFILES): $(srcdir)/$(DOMAIN).pot
.po.gmo:
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
Expand All @@ -123,8 +127,6 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
mv t-$@ $@


all: all-@USE_NLS@

all-yes: $(srcdir)/stamp-po
all-no:

Expand Down Expand Up @@ -413,12 +415,17 @@ dist distdir:
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(srcdir)/stamp-po $(DISTFILES)
dists="$(DISTFILES)"; \
@dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
dists="$$dists $(DOMAIN).pot stamp-po"; \
else \
case $(XGETTEXT) in \
:) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \
*) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \
esac; \
fi; \
if test -f $(srcdir)/ChangeLog; then \
dists="$$dists ChangeLog"; \
Expand Down

0 comments on commit 4b9c27b

Please sign in to comment.