diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-12 18:03:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-12 18:03:29 +0200 |
| commit | e639eb44e9ca063f682f064095aa98fc781f5df1 (patch) | |
| tree | e743fcd6d235b940df364569ca65943354ecccc4 | |
| parent | 0e6c5ef7ef4f4a1eb16b5eebc97e3bf139d6276a (diff) | |
updated for version 7.4.322v7.4.322
Problem: Using "msgfmt" is hard coded, cannot use "gmsgfmt".
Solution: Use the msgfmt command found by configure. (Danek Duvall)
| -rw-r--r-- | src/config.mk.in | 2 | ||||
| -rw-r--r-- | src/po/Makefile | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/config.mk.in b/src/config.mk.in index 3b08766d1b..bd5649e4d7 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -164,6 +164,8 @@ OS_EXTRA_OBJ = @OS_EXTRA_OBJ@ ### If the *.po files are to be translated to *.mo files. MAKEMO = @MAKEMO@ +MSGFMT = @MSGFMT@ + # Make sure that "make first" will run "make all" once configure has done its # work. This is needed when using the Makefile in the top directory. first: all diff --git a/src/po/Makefile b/src/po/Makefile index 7f5df53b26..d9aa834574 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -1,5 +1,8 @@ # Makefile for the Vim message translations. +# Include stuff found by configure. +include ../auto/config.mk + # TODO make this configurable # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are # not installed on Unix @@ -133,7 +136,7 @@ VIM = ../vim # tools 0.10.37, which use a slightly different .po file format that is not # compatible with Solaris (and old gettext implementations) unless these are # set. gettext 0.10.36 will not work! -MSGFMT = OLD_PO_FILE_INPUT=yes msgfmt -v +MSGFMTCMD = OLD_PO_FILE_INPUT=yes $(MSGFMT) -v XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge @@ -142,7 +145,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED) .po.mo: - $(MSGFMT) -o $@ $< + $(MSGFMTCMD) -o $@ $< .po.ck: $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $< diff --git a/src/version.c b/src/version.c index a876bf82e4..5556ed7eec 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 322, +/**/ 321, /**/ 320, |