|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.322
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.322
|
|
|
22c937 |
Problem: Using "msgfmt" is hard coded, cannot use "gmsgfmt".
|
|
|
22c937 |
Solution: Use the msgfmt command found by configure. (Danek Duvall)
|
|
|
22c937 |
Files: src/config.mk.in, src/po/Makefile
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.321/src/config.mk.in 2010-11-03 22:26:24.000000000 +0100
|
|
|
22c937 |
--- src/config.mk.in 2014-06-12 17:41:12.892268607 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 164,169 ****
|
|
|
22c937 |
--- 164,171 ----
|
|
|
22c937 |
### If the *.po files are to be translated to *.mo files.
|
|
|
22c937 |
MAKEMO = @MAKEMO@
|
|
|
22c937 |
|
|
|
22c937 |
+ MSGFMT = @MSGFMT@
|
|
|
22c937 |
+
|
|
|
22c937 |
# Make sure that "make first" will run "make all" once configure has done its
|
|
|
22c937 |
# work. This is needed when using the Makefile in the top directory.
|
|
|
22c937 |
first: all
|
|
|
22c937 |
*** ../vim-7.4.321/src/po/Makefile 2013-06-23 13:26:12.000000000 +0200
|
|
|
22c937 |
--- src/po/Makefile 2014-06-12 17:45:19.116277922 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1,5 ****
|
|
|
22c937 |
--- 1,8 ----
|
|
|
22c937 |
# Makefile for the Vim message translations.
|
|
|
22c937 |
|
|
|
22c937 |
+ # Include stuff found by configure.
|
|
|
22c937 |
+ include ../auto/config.mk
|
|
|
22c937 |
+
|
|
|
22c937 |
# TODO make this configurable
|
|
|
22c937 |
# Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
|
|
|
22c937 |
# not installed on Unix
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 133,139 ****
|
|
|
22c937 |
# tools 0.10.37, which use a slightly different .po file format that is not
|
|
|
22c937 |
# compatible with Solaris (and old gettext implementations) unless these are
|
|
|
22c937 |
# set. gettext 0.10.36 will not work!
|
|
|
22c937 |
! MSGFMT = OLD_PO_FILE_INPUT=yes msgfmt -v
|
|
|
22c937 |
XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
|
|
|
22c937 |
MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
|
|
|
22c937 |
|
|
|
22c937 |
--- 136,142 ----
|
|
|
22c937 |
# tools 0.10.37, which use a slightly different .po file format that is not
|
|
|
22c937 |
# compatible with Solaris (and old gettext implementations) unless these are
|
|
|
22c937 |
# set. gettext 0.10.36 will not work!
|
|
|
22c937 |
! MSGFMTCMD = OLD_PO_FILE_INPUT=yes $(MSGFMT) -v
|
|
|
22c937 |
XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
|
|
|
22c937 |
MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
|
|
|
22c937 |
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 142,148 ****
|
|
|
22c937 |
.PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
|
|
|
22c937 |
|
|
|
22c937 |
.po.mo:
|
|
|
22c937 |
! $(MSGFMT) -o $@ $<
|
|
|
22c937 |
|
|
|
22c937 |
.po.ck:
|
|
|
22c937 |
$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
|
|
|
22c937 |
--- 145,151 ----
|
|
|
22c937 |
.PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
|
|
|
22c937 |
|
|
|
22c937 |
.po.mo:
|
|
|
22c937 |
! $(MSGFMTCMD) -o $@ $<
|
|
|
22c937 |
|
|
|
22c937 |
.po.ck:
|
|
|
22c937 |
$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
|
|
|
22c937 |
*** ../vim-7.4.321/src/version.c 2014-06-12 16:03:24.268046589 +0200
|
|
|
22c937 |
--- src/version.c 2014-06-12 17:42:27.584271433 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 736,737 ****
|
|
|
22c937 |
--- 736,739 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 322,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
If I tell you "you have a beautiful body", would you hold it against me?
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|