2 files changed, 6 insertions, 1 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f16de071860..9091da843cf 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-06  Juanma Barranquero  <lektu@terra.es>
 
+        * makefile.w32-in (bootstrap-nmake): When nmake'ing bootstrap on
+        the lisp/ directory, set SHELL to $(SHELLTYPE); this avoids
+        calling non-existent cmdproxy.exe on boostrappings after a
+        previous install followed by realclean.
+
         * nmake.defs: Add quote in comment to resync font-locking.
 
 2004-06-04  Juanma Barranquero  <lektu@terra.es>
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 4f619b3f2e3..6363904108e 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -139,7 +139,7 @@ bootstrap-nmake:
         $(MAKE) $(MFLAGS) bootstrap

         $(MAKE) $(MFLAGS) bootstrap-clean

         cd ..\lisp

-        $(MAKE) $(MFLAGS) bootstrap

+        $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap

         cd ..\lib-src

         $(MAKE) $(MFLAGS) DOC

         cd ..\nt