changeset 34859:de4405462a2a v9.1.0298

patch 9.1.0298: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Commit: https://github.com/vim/vim/commit/2f27c65410dcb68fd06cb6c54c1ed8fae2d11c79 Author: Cthulhux <github@tuxproject.de> Date: Wed Apr 10 16:34:49 2024 +0200 patch 9.1.0298: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Problem: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Solution: Add IFNDEF/ENDIF around the definition of GETTEXT_PATH (Cthulhux) It makes no sense to enforce modifying Vim source files just because your build stuff is not where it's expected. My change is supposed to add support for a locally-defined %GETTEXT_PATH%. closes: #14480 Signed-off-by: Cthulhux <github@tuxproject.de> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Wed, 10 Apr 2024 16:45:03 +0200
parents 48cd599b2380
children b9a13dd2ea19
files src/po/Make_mvc.mak src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -44,7 +44,9 @@ VIM = ..\vim.exe
 
 # Correct the following line for the directory where gettext et al is
 # installed.  Please do not put the path in quotes.
+!IFNDEF GETTEXT_PATH
 GETTEXT_PATH = D:\Programs\GetText\bin
+!ENDIF
 
 # Starting from version 0.22, msgfmt forcibly converts text to UTF-8 regardless
 # of the value of the "charset" field.
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    298,
+/**/
     297,
 /**/
     296,