Mercurial > vim
changeset 5962:fd96c55d683d v7.4.322
updated for version 7.4.322
Problem: Using "msgfmt" is hard coded, cannot use "gmsgfmt".
Solution: Use the msgfmt command found by configure. (Danek Duvall)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 12 Jun 2014 18:03:29 +0200 |
| parents | b3796275b311 |
| children | c23596b8e34f |
| files | src/config.mk.in src/po/Makefile src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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_ .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 $<