thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.322

Browse Source 
Problem:    Using "msgfmt" is hard coded, cannot use "gmsgfmt".
Solution:   Use the msgfmt command found by configure. (Danek Duvall)
This commit is contained in:
Bram Moolenaar
2014-06-12 18:03:29 +02:00
parent 0e6c5ef7ef
commit e639eb44e9
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.mk.in
View File

@@ -164,6 +164,8 @@ OS_EXTRA_OBJ = @OS_EXTRA_OBJ@
### If the *.po files are to be translated to *.mo files. ### If the *.po files are to be translated to *.mo files.
MAKEMO = @MAKEMO@ MAKEMO = @MAKEMO@
MSGFMT = @MSGFMT@
# Make sure that "make first" will run "make all" once configure has done its # 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. # work. This is needed when using the Makefile in the top directory.
first: all first: all

7
src/po/Makefile
View File

@@ -1,5 +1,8 @@
# Makefile for the Vim message translations. # Makefile for the Vim message translations.
# Include stuff found by configure.
include ../auto/config.mk
# TODO make this configurable # TODO make this configurable
# Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
# not installed on Unix # 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 # 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 # compatible with Solaris (and old gettext implementations) unless these are
# set. gettext 0.10.36 will not work! # 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 XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge 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) .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMTCMD) -o $@ $<
.po.ck: .po.ck:
$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $< $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
322,
/**/ /**/
321, 321,
/**/ /**/