patch 7.4.992v7.4.992

Problem:    Makefiles for MS-Windows in src/po are outdated.
Solution:   Make them work. (Ken Takata, Taro Muraoka)

1 files changed, 40 insertions, 3 deletions

diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index 32eecfe00..9deba7974 100644
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -6,10 +6,15 @@
 # Please read README_mvc.txt before using this file.
 #
 
+!ifndef VIMRUNTIME
+VIMRUNTIME = ..\..\runtime
+!endif
+
 LANGUAGES = \
 		af \
 		ca \
 		cs \
+		cs.cp1250 \
 		de \
 		en_GB \
 		eo \
@@ -19,16 +24,27 @@ LANGUAGES = \
 		ga \
 		it \
 		ja \
+		ja.euc-jp \
+		ja.sjis \
 		ko \
+		ko.UTF-8 \
+		nb \
+		nl \
 		no \
 		pl \
+		pl.cp1250 \
+		pl.UTF-8 \
 		pt_BR \
 		ru \
+		ru.cp1251 \
 		sk \
+		sk.cp1250 \
 		sv \
 		uk \
+		uk.cp1251 \
 		vi \
 		zh_CN \
+		zh_CN.cp936 \
 		zh_CN.UTF-8 \
 		zh_TW \
 		zh_TW.UTF-8 \
@@ -36,6 +52,7 @@ LANGUAGES = \
 MOFILES = \
 		af.mo \
 		ca.mo \
+		cs.cp1250.mo \
 		cs.mo \
 		de.mo \
 		en_GB.mo \
@@ -45,27 +62,38 @@ MOFILES = \
 		fr.mo \
 		ga.mo \
 		it.mo \
+		ja.euc-jp.mo \
 		ja.mo \
+		ja.sjis.mo \
 		ko.mo \
+		ko.UTF-8.mo \
+		nb.mo \
+		nl.mo \
 		no.mo \
+		pl.cp1250.mo \
 		pl.mo \
+		pl.UTF-8.mo \
 		pt_BR.mo \
+		ru.cp1251.mo \
 		ru.mo \
+		sk.cp1250.mo \
 		sk.mo \
 		sv.mo \
+		uk.cp1251.mo \
 		uk.mo \
 		vi.mo \
-		zh_CN.UTF-8.mo \
 		zh_CN.mo \
-		zh_TW.UTF-8.mo \
+		zh_CN.cp936.mo \
+		zh_CN.UTF-8.mo \
 		zh_TW.mo \
+		zh_TW.UTF-8.mo \
 
 PACKAGE = vim
 
 # Correct the following line for the directory where gettext et al is installed
 GETTEXT_PATH = H:\gettext.0.14.4\bin
 
-MSGFMT = $(GETTEXT_PATH)\msgfmt
+MSGFMT = $(GETTEXT_PATH)\msgfmt -v
 XGETTEXT = $(GETTEXT_PATH)\xgettext
 MSGMERGE = $(GETTEXT_PATH)\msgmerge
 
@@ -83,6 +111,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
 .SUFFIXES: .po .mo .pot
 
 .po.mo:
+	set OLD_PO_FILE_INPUT=yes
 	$(MSGFMT) -o $@ $<
 
 all: $(MOFILES)
@@ -91,9 +120,13 @@ files:
 	$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files
 
 first_time: files
+	set OLD_PO_FILE_INPUT=yes
+	set OLD_PO_FILE_OUTPUT=yes
 	$(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
 
 $(LANGUAGES): files
+	set OLD_PO_FILE_INPUT=yes
+	set OLD_PO_FILE_OUTPUT=yes
 	$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
 	$(MV) $(PACKAGE).po $(PACKAGE).pot
 	$(CP) $@.po $@.po.orig
@@ -105,6 +138,10 @@ install:
 	if not exist $(INSTALLDIR) $(MKD) $(INSTALLDIR)
 	$(CP) $(LANGUAGE).mo $(INSTALLDIR)\$(PACKAGE).mo
 
+install-all: all
+	FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l\LC_MESSAGES $(MKD) $(VIMRUNTIME)\lang\%%l\LC_MESSAGES
+	FOR %%l IN ($(LANGUAGES)) DO @$(CP) %%l.mo $(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo
+
 clean:
 	$(RM) *.mo
 	$(RM) *.pot