aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Key2004-07-24 04:52:27 +0000
committerBen Key2004-07-24 04:52:27 +0000
commitd5ef6196df647d17dfc608d82925965518ba6bb5 (patch)
treebeb78bb16ddbce9736a95e1ebb5734b18711a6a8
parentbc135062b596bd876a72f9016fa6274ecd28b275 (diff)
downloademacs-d5ef6196df647d17dfc608d82925965518ba6bb5.tar.gz
emacs-d5ef6196df647d17dfc608d82925965518ba6bb5.zip
Removed the various "echo." lines from lisp\makefile.w32-in and nt\makefile.w32-in.
They caused mingw32-make.exe bootstrap to fail with the following error if cmd.exe was being used as the shell: "process_begin: CreateProcess((null), echo., ...) failed." I replaced the "@echo." lines in nt\makefile.w32-in with "@echo ." This writes a . to the screen but that is far more desirable than make bootstrap failing. I replaced the "echo. ..." line in lisp\makefile.w32-in with "echo ;;; ...". This writes an extra comment line to loaddefs.el. Again this is far more desirable than make bootstrap failing. NOTE: I am using cmd.exe as my shell when building Emacs with MinGW instead of the sh.exe that comes with msys because when I use sh.exe as my shell, loaddefs.el does not get properly generated and I get various auto load errors.
-rw-r--r--lisp/makefile.w32-in2
-rw-r--r--nt/makefile.w32-in4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 826cf89bfec..b2694bc2b78 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -209,7 +209,7 @@ loaddefs.el-CMD:
209 echo (autoload 'define-derived-mode "derived")>> $@ 209 echo (autoload 'define-derived-mode "derived")>> $@
210 echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@ 210 echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
211 echo (defvar cvs-global-menu nil)>> $@ 211 echo (defvar cvs-global-menu nil)>> $@
212 echo. >> $@ 212 echo ;;; >> $@
213 echo ;;; Local Variables:>> $@ 213 echo ;;; Local Variables:>> $@
214 echo ;;; version-control: never>> $@ 214 echo ;;; version-control: never>> $@
215 echo ;;; no-byte-compile: t>> $@ 215 echo ;;; no-byte-compile: t>> $@
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index adbb3fd57b8..ec30853ed29 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -111,10 +111,10 @@ maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE)
111doit: 111doit:
112 112
113maybe-bootstrap-CMD: doit 113maybe-bootstrap-CMD: doit
114 @echo. 114 @echo .
115 @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing. You should either 115 @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing. You should either
116 @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow 116 @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow
117 @echo. 117 @echo .
118 @if not EXIST ..\lisp\abbrev.elc exit -1 118 @if not EXIST ..\lisp\abbrev.elc exit -1
119 119
120maybe-bootstrap-SH: doit 120maybe-bootstrap-SH: doit