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 <cb@256bit.org>

diff --git a/Makefile b/Makefile
index 3151c24aa8ba67e43f32bcf48b5dcb7194888eda..12aa1f37da3f7a60e0a6886c2a37b33702870d19 100644 (file)
--- 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 ad8a7480bb070737ccfba674a7dbaa5f3d494120..c9f88e93d920097fb42a59e669315bb9584c1f42 100644 (file)
--- 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,
 /**/