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 <bensberg@justemail.net>

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index b0281d3a0cfb22a867028946fbda0eb85b3dc391..ef3b026740c537b5fbc311af26d8557b30225a69 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-31  Benno Schulenberg <bensberg@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  <ueno@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 d1ca9d781a2a82ceef02f683e8364c2468a0f735..1998486e1c0b436ba22b9f503fedf82d66420ff7 100644 (file)
--- 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;; \
                   *) \