diff options
| author | Benno Schulenberg <bensberg@justemail.net> | 2015-06-01 12:46:45 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-06-02 11:50:59 +0900 |
| commit | 501d166b9cf38b25f63346f8900f6e5f669498e2 (patch) | |
| tree | c5430d2ab3ed12df1f69b2895d0abb8463569aed /gettext-runtime/po | |
| parent | 60bf5ccc462fbd07ae8b6132f916ae1f5c22d0d7 (diff) | |
| download | external_gettext-501d166b9cf38b25f63346f8900f6e5f669498e2.zip external_gettext-501d166b9cf38b25f63346f8900f6e5f669498e2.tar.gz external_gettext-501d166b9cf38b25f63346f8900f6e5f669498e2.tar.bz2 | |
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>
Diffstat (limited to 'gettext-runtime/po')
| -rw-r--r-- | gettext-runtime/po/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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 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;; \ *) \ |