aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2004-06-06 02:00:18 +0000
committerJuanma Barranquero2004-06-06 02:00:18 +0000
commit73dfa0bf16d1e474b0071b71d409cdbf23a9987b (patch)
treee1fcc9438221fe8a09e6c0376ed25d2944e62e95
parent133ef3d3775f6f25a3974fbb3a86277040f14c51 (diff)
downloademacs-73dfa0bf16d1e474b0071b71d409cdbf23a9987b.tar.gz
emacs-73dfa0bf16d1e474b0071b71d409cdbf23a9987b.zip
(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 @@
12004-06-06 Juanma Barranquero <lektu@terra.es> 12004-06-06 Juanma Barranquero <lektu@terra.es>
2 2
3 * makefile.w32-in (bootstrap-nmake): When nmake'ing bootstrap on
4 the lisp/ directory, set SHELL to $(SHELLTYPE); this avoids
5 calling non-existent cmdproxy.exe on boostrappings after a
6 previous install followed by realclean.
7
3 * nmake.defs: Add quote in comment to resync font-locking. 8 * nmake.defs: Add quote in comment to resync font-locking.
4 9
52004-06-04 Juanma Barranquero <lektu@terra.es> 102004-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:
139 $(MAKE) $(MFLAGS) bootstrap 139 $(MAKE) $(MFLAGS) bootstrap
140 $(MAKE) $(MFLAGS) bootstrap-clean 140 $(MAKE) $(MFLAGS) bootstrap-clean
141 cd ..\lisp 141 cd ..\lisp
142 $(MAKE) $(MFLAGS) bootstrap 142 $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
143 cd ..\lib-src 143 cd ..\lib-src
144 $(MAKE) $(MFLAGS) DOC 144 $(MAKE) $(MFLAGS) DOC
145 cd ..\nt 145 cd ..\nt