patch 9.1.2053: MS-Windows: May use wrong find command

Problem:  If another find.exe derived from findutils is installed on
          Windows, unintended behavior will occur. If MSYS2 is installed and
          prioritized over the system path, then find.exe derived from
          findutils will be launched during build, resulting in an
          unintended warning message.
Solution: Specify the absolute path including SYSTEMROOT to launch
          find.exe (Muraoka Taro)

closes: #19081

Signed-off-by: Muraoka Taro <koron.kaoriya@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/auto/nmake/tools.mak b/src/auto/nmake/tools.mak
index cfeb09ab39d8ea3562f4f27433d5e5dcec62b86c..d1672ca9fb537c2b13453dd49a8c020aef4c8997 100644 (file)
--- a/src/auto/nmake/tools.mak
+++ b/src/auto/nmake/tools.mak
@@ -23,7 +23,7 @@ PSFLAGS = -NoLogo -NoProfile -Command
 !ERROR The PowerShell program version 3.0 or higher is required for work.
 !ENDIF
 
-!IF ![echo $(COMSPEC) | 1> nul find "cmd.exe"]
+!IF ![echo $(COMSPEC) | 1> nul $(SYSTEMROOT)\System32\find.exe "cmd.exe"]
 CMD = $(COMSPEC)
 !ELSE
 CMD = $(SYSTEMROOT)\System32\cmd.exe

diff --git a/src/version.c b/src/version.c
index f904ac16d85507edc0b6cded86c8c143ca7cbf93..a9c9d0544b2b6320855e2be5dc29120fd1542e0a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2053,
 /**/
     2052,
 /**/