summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2004-06-06 02:00:18 +0000
committerJuanma Barranquero <lekktu@gmail.com>2004-06-06 02:00:18 +0000
commit73dfa0bf16d1e474b0071b71d409cdbf23a9987b (patch)
treee1fcc9438221fe8a09e6c0376ed25d2944e62e95
parent133ef3d3775f6f25a3974fbb3a86277040f14c51 (diff)
downloademacs-73dfa0bf16d1e474b0071b71d409cdbf23a9987b.tar.gz
(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.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/makefile.w32-in2
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