In gettext-runtime/po/Makefile.in.in a 'msgmerge --update --version'
is done. I think the --update option should not be there, simply
because it's unneeded, but also because it could cause the call to
fail when msgmerge is from before 2001. Attached patch removes
the option.
Benno
--
http://www.fastmail.com - Accessible with your email software
or over the web
From a20a576fdff223af2ad716fd6faa4d11fcd0a905 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensb...@justemail.net>
Date: Mon, 1 Jun 2015 12:46:45 +0200
Subject: [PATCH] po: When doing msgmerge --version, no other options are needed.
* gettext-runtime/po/Makefile.in.in: Do not use --update when simply
checking for the version, as this might fail when msgmerge is very old.
Signed-off-by: Benno Schulenberg <bensb...@justemail.net>
---
gettext-runtime/po/ChangeLog | 5 +++++
gettext-runtime/po/Makefile.in.in | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index b0281d3..ef3b026 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-31 Benno Schulenberg <bensb...@justemail.net> (tiny change)
+
+ * Makefile.in.in: Do not use --update when simply checking for
+ the version, as this might fail when msgmerge is very old.
+
2015-02-18 Daiki Ueno <u...@gnu.org>
* Makefile.in.in: Replace our own wording of licensing with GNU
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index d1ca9d7..1998486 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -224,7 +224,7 @@ $(POFILES): $(POFILESDEPS)
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
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].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
*) \
--
1.7.0.4
