diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 8bf9077484..7ca2671f25 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -399,14 +399,14 @@ GIT = git
 !if "$(HAVE_GIT)" == "yes" || "$(HAVE_GIT)" == "no"
 !else if "$(GIT)" == ""
 HAVE_GIT = no
-!else if [for %I in ($(GIT)) @if not "%~xI" == "" exit 1]
-! if [for %I in ($(GIT)) @if not "%~$PATH:I" == "" exit 1]
+!else if [for %I in ($(GIT)) do @if not "%~xI" == "" exit 1]
+! if [for %I in ($(GIT)) do @if not "%~$$PATH:I" == "" exit 1]
 HAVE_GIT = yes
 ! else
 HAVE_GIT = no
 ! endif
 !else
-! if [for %x in (%PATHEXT:;= %) do @for %I in ($(GIT)%x) do @if not "%~$PATH:I" == . exit 1]
+! if [for %x in (%PATHEXT:;= %) do @for %I in ($(GIT)%x) do @if not "%~$$PATH:I" == "" exit 1]
 HAVE_GIT = yes
 ! else
 HAVE_GIT = no