From: Christian Brabandt Date: Wed, 22 Jan 2025 21:21:50 +0000 (+0100) Subject: patch 9.1.1047: Makefiles uses non-portable syntax X-Git-Tag: v9.1.1047^0 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=613d0bc128a86870ed978f08981becc619f95d58;p=thirdparty%2Fvim.git patch 9.1.1047: Makefiles uses non-portable syntax Problem: Makefiles uses non-portable syntax (simo-zz, after v9.1.1029) Solution: Revert auto-generation of MAJOR/MINOR variables fixes: #16502 closes: #16503 Signed-off-by: Christian Brabandt --- diff --git a/Makefile b/Makefile index 3151c24aa8..12aa1f37da 100644 --- a/Makefile +++ b/Makefile @@ -96,14 +96,8 @@ syntaxtest: # To do all this you need the Unix archive and compiled binaries. # Before creating an archive first delete all backup files, *.orig, etc. -# I think it is better to place getting the current version number in the -# configure script. And then automatically fill in the fields in the files -# listed below. (Restorer) - -MAJOR != grep -E 'VIM_VERSION_MAJOR\s{2,}' src/version.h | \ - awk '{ printf "%d",$$3 }' -MINOR != grep -E 'VIM_VERSION_MINOR\s{2,}' src/version.h | \ - awk '{ printf "%d",$$3 }' +MAJOR = 9 +MINOR = 1 # CHECKLIST for creating a new version: # diff --git a/src/version.c b/src/version.c index ad8a7480bb..c9f88e93d9 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1047, /**/ 1046, /**/