From de46bb578481150f4bad748a89e5d0bd256644d3 Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Mon, 28 Dec 2015 21:54:37 +0900
Subject: [PATCH] Update src/po/*.mak for Win32

Set some variables for processing ja.po and zh_CN.cp936.
---
 src/po/Make_cyg.mak  |  8 ++++++--
 src/po/Make_ming.mak | 14 ++++++++++----
 src/po/Make_mvc.mak  | 15 +++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 286a8b317acbb..4a86d28df20b3 100644
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -8,8 +8,6 @@
 # Use at your own risk but with care, it could even kill your canary.
 #
 
-# TODO: GNU gettext 0.19.5.1 cannot process ja.sjis and zh_CN.cp936.
-
 ifndef VIMRUNTIME
 VIMRUNTIME = ../../runtime
 endif
@@ -29,6 +27,7 @@ LANGUAGES = \
 		it \
 		ja \
 		ja.euc-jp \
+		ja.sjis \
 		ko \
 		ko.UTF-8 \
 		nb \
@@ -47,6 +46,7 @@ LANGUAGES = \
 		uk.cp1251 \
 		vi \
 		zh_CN \
+		zh_CN.cp936 \
 		zh_CN.UTF-8 \
 		zh_TW \
 		zh_TW.UTF-8 \
@@ -66,6 +66,7 @@ MOFILES = \
 		it.mo \
 		ja.euc-jp.mo \
 		ja.mo \
+		ja.sjis.mo \
 		ko.mo \
 		ko.UTF-8.mo \
 		nb.mo \
@@ -84,6 +85,7 @@ MOFILES = \
 		uk.mo \
 		vi.mo \
 		zh_CN.mo \
+		zh_CN.cp936.mo \
 		zh_CN.UTF-8.mo \
 		zh_TW.mo \
 		zh_TW.UTF-8.mo \
@@ -143,6 +145,8 @@ install: $(MOFILES)
 		$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
 	done
 
+install-all: install
+
 clean:
 	$(RM) *.mo
 	$(RM) *.pot
diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index ed5c79a7eff5f..eea106ede3685 100644
--- a/src/po/Make_ming.mak
+++ b/src/po/Make_ming.mak
@@ -10,7 +10,9 @@
 # language (xx) and add it to the next three lines.
 #
 
-# TODO: GNU gettext 0.19.5.1 cannot process ja.sjis and zh_CN.cp936.
+ifndef VIMRUNTIME
+VIMRUNTIME = ..\..\runtime
+endif
 
 LANGUAGES = \
 		af \
@@ -27,6 +29,7 @@ LANGUAGES = \
 		it \
 		ja \
 		ja.euc-jp \
+		ja.sjis \
 		ko \
 		ko.UTF-8 \
 		nb \
@@ -45,6 +48,7 @@ LANGUAGES = \
 		uk.cp1251 \
 		vi \
 		zh_CN \
+		zh_CN.cp936 \
 		zh_CN.UTF-8 \
 		zh_TW \
 		zh_TW.UTF-8 \
@@ -64,6 +68,7 @@ MOFILES = \
 		it.mo \
 		ja.euc-jp.mo \
 		ja.mo \
+		ja.sjis.mo \
 		ko.mo \
 		ko.UTF-8.mo \
 		nb.mo \
@@ -82,6 +87,7 @@ MOFILES = \
 		uk.mo \
 		vi.mo \
 		zh_CN.mo \
+		zh_CN.cp936.mo \
 		zh_CN.UTF-8.mo \
 		zh_TW.mo \
 		zh_TW.UTF-8.mo \
@@ -94,9 +100,9 @@ PACKAGE = vim
 #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
 #GETTEXT_PATH = C:/cygwin/bin/
 
-MSGFMT = $(GETTEXT_PATH)msgfmt
-XGETTEXT = $(GETTEXT_PATH)xgettext
-MSGMERGE = $(GETTEXT_PATH)msgmerge
+MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
+XGETTEXT = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)xgettext
+MSGMERGE = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)msgmerge
 
 MV = move
 CP = copy
diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index 928c3aa17836a..9deba79746d31 100644
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -6,7 +6,9 @@
 # Please read README_mvc.txt before using this file.
 #
 
-# TODO: GNU gettext 0.19.5.1 cannot process ja.sjis and zh_CN.cp936.
+!ifndef VIMRUNTIME
+VIMRUNTIME = ..\..\runtime
+!endif
 
 LANGUAGES = \
 		af \
@@ -23,6 +25,7 @@ LANGUAGES = \
 		it \
 		ja \
 		ja.euc-jp \
+		ja.sjis \
 		ko \
 		ko.UTF-8 \
 		nb \
@@ -41,6 +44,7 @@ LANGUAGES = \
 		uk.cp1251 \
 		vi \
 		zh_CN \
+		zh_CN.cp936 \
 		zh_CN.UTF-8 \
 		zh_TW \
 		zh_TW.UTF-8 \
@@ -60,6 +64,7 @@ MOFILES = \
 		it.mo \
 		ja.euc-jp.mo \
 		ja.mo \
+		ja.sjis.mo \
 		ko.mo \
 		ko.UTF-8.mo \
 		nb.mo \
@@ -78,6 +83,7 @@ MOFILES = \
 		uk.mo \
 		vi.mo \
 		zh_CN.mo \
+		zh_CN.cp936.mo \
 		zh_CN.UTF-8.mo \
 		zh_TW.mo \
 		zh_TW.UTF-8.mo \
@@ -87,7 +93,7 @@ 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
 
@@ -105,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)
@@ -113,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