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)

diff --git a/src/config.mk.in b/src/config.mk.in
index 3b08766d1b09f76c23965b932a26a953d5c02424..bd5649e4d72df1a5f237a3546dbc9ee15d4c6551 100644 (file)
--- 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 7f5df53b26f22b84a4f9865e982d56d31b6bf2ac..d9aa8345741ce4ffc32858b527b8f8449a0ddfb1 100644 (file)
--- 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 a876bf82e491ea373e09475195f055fc5543d21d..5556ed7eece493f5cdc53bad2d28416779d46276 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    322,
 /**/
     321,
 /**/