diff options
| author | Cthulhux <github@tuxproject.de> | 2024-04-10 16:34:49 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-10 16:34:49 +0200 |
| commit | 2f27c65410dcb68fd06cb6c54c1ed8fae2d11c79 (patch) | |
| tree | b2af585f6249b38746aa211b9be2505a94437fd7 | |
| parent | c97f4d61cde24030f2f7d2318e1b409a0ccc3e43 (diff) | |
patch 9.1.0298: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.makv9.1.0298
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>
| -rw-r--r-- | src/po/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index fa6a1ba590..a9a69fdcc2 100644 --- 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. diff --git a/src/version.c b/src/version.c index 5bf9581b56..520b7e9c2b 100644 --- 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, |