Skip to content

Commit 4b9c27b

Browse files
committed
Use the newest gettext release.
* 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.
1 parent 2320d92 commit 4b9c27b

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

po/ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2022-05-15 Bruno Haible <bruno@clisp.org>
2+
3+
Use the newest gettext release.
4+
* Makefile.in.in: Upgrade to gettext-0.21, keeping the change
5+
2019-01-27 Bruno Haible <bruno@clisp.org>
6+
Accommodate a shell that is not in /bin/sh.
7+
* Makefile.in.in (SHELL): Use the value found by configure.
8+
19
2022-05-15 Bruno Haible <bruno@clisp.org>
210

311
Update translations.

po/Makefile.in.in

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Makefile for PO directory in any package using GNU gettext.
22
# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
3-
# Copyright (C) 2000-2019 Free Software Foundation, Inc.
3+
# Copyright (C) 2000-2020 Free Software Foundation, Inc.
44
#
55
# Copying and distribution of this file, with or without modification,
66
# are permitted in any medium without royalty provided the copyright
77
# notice and this notice are preserved. This file is offered as-is,
88
# without any warranty.
99
#
10-
# Origin: gettext-0.20
10+
# Origin: gettext-0.21
1111
GETTEXT_MACRO_VERSION = 0.20
1212

1313
PACKAGE = @PACKAGE@
@@ -90,6 +90,9 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
9090

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

93+
all: all-@USE_NLS@
94+
95+
9396
.SUFFIXES:
9497
.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
9598

@@ -107,7 +110,8 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
107110
# the .pot file. This eliminates the need to update the .po files when the
108111
# .pot file has changed, which would be troublesome if the .po files are put
109112
# under version control.
110-
.po.gmo: $(srcdir)/$(DOMAIN).pot
113+
$(GMOFILES): $(srcdir)/$(DOMAIN).pot
114+
.po.gmo:
111115
@lang=`echo $* | sed -e 's,.*/,,'`; \
112116
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
113117
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"; \
@@ -123,8 +127,6 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
123127
mv t-$@ $@
124128

125129

126-
all: all-@USE_NLS@
127-
128130
all-yes: $(srcdir)/stamp-po
129131
all-no:
130132

@@ -413,12 +415,17 @@ dist distdir:
413415
@$(MAKE) dist2
414416
# This is a separate target because 'update-po' must be executed before.
415417
dist2: $(srcdir)/stamp-po $(DISTFILES)
416-
dists="$(DISTFILES)"; \
418+
@dists="$(DISTFILES)"; \
417419
if test "$(PACKAGE)" = "gettext-tools"; then \
418420
dists="$$dists Makevars.template"; \
419421
fi; \
420422
if test -f $(srcdir)/$(DOMAIN).pot; then \
421423
dists="$$dists $(DOMAIN).pot stamp-po"; \
424+
else \
425+
case $(XGETTEXT) in \
426+
:) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \
427+
*) 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;; \
428+
esac; \
422429
fi; \
423430
if test -f $(srcdir)/ChangeLog; then \
424431
dists="$$dists ChangeLog"; \

0 commit comments

Comments
 (0)