X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b712940ae05f257625d4fb05d9e4d4d3728d24d7..d4225c08140da5c1d7a73de98245ad9fc49a1b81:/msdos/mainmake.v2

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 626ed5f350..910014de9c 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -32,8 +32,15 @@
 # This gork is required for those who use a Unix-style shell, and
 # have SHELL in the environment pointing to it.  Here we force
 # Make to use COMMAND.COM instead.  This Makefile won't work otherwise.
-SHELL=/dos/command
-MAKESHELL=/dos/command
+# (The /xyzzy directory is used to minimize the chance that someone
+# actually has such a directory with an incompatible command.com.  We
+# used to have /dos there, but some Windows installations have an old
+# version of DOS stashed in that directory, and command.com from there
+# won't run on Windows, complaining about "Incorrect DOS version".
+# Make will look up PATH for the shell executable, so the directory name
+# is not important.)
+SHELL=/xyzzy/command
+MAKESHELL=/xyzzy/command
 
 # Generate a full pathname of the top-level installation directory
 top_srcdir := $(subst \,/,$(shell cd))
@@ -51,14 +58,14 @@ lib-src: FRC
 src: FRC
 	cd src
 	$(MAKE) top_srcdir=${top_srcdir}
-	redir -o gdb.sed echo '/-geometry/s,^.*,set environment HOME $(top_srcdir),'
-	redir -oa gdb.sed echo '/environment *TERM/s/^.*/set environment TERM internal/'
-	redir -oa gdb.sed echo '/x_error_quitter/s/^.*/set environment NAME root/'
-	redir -o gdb.tmp sed -f gdb.sed _gdbinit
-	redir -oa gdb.tmp echo 'set environment USER root'
-	redir -oa gdb.tmp echo 'set environment EMACSPATH $(top_srcdir)/bin'
-	redir -oa gdb.tmp echo 'set environment SHELL $(subst \,/,$(COMSPEC))'
-	redir -oa gdb.tmp echo 'set environment PATH $(subst \,/,$(PATH))'
+	djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
+	          '/environment *TERM/s/^.*/set environment TERM internal/' \
+	          '/x_error_quitter/s/^.*/set environment NAME root/' >gdb.sed
+	sed -f gdb.sed _gdbinit >gdb.tmp
+	djecho -a gdb.tmp -s 'set environment USER root' \
+	                     'set environment EMACSPATH $(top_srcdir)/bin' \
+	                     'set environment SHELL $(subst \,/,$(COMSPEC))' \
+	                     'set environment PATH $(subst \,/,$(PATH))'
 	update gdb.tmp gdb.ini
 	rm -f gdb.tmp gdb.sed
 	cd ..
@@ -72,10 +79,8 @@ man:	FRC
 install: all
 	if not exist bin\nul md bin
 	cd lib-src
-	if exist hexl.exe mv -f hexl.exe ../bin
-	if exist etags.exe mv -f etags.exe ../bin
-	if exist ctags.exe mv -f ctags.exe ../bin
-	if exist b2m.exe mv -f b2m.exe ../bin
+	command.com /c >/dev/null for %p in (hexl etags ctags b2m ebrowse) do\
+	   if exist %p.exe mv -f %p.exe ../bin
 	if exist fns.el update fns.el ../bin/fns.el
 	cd ..
 	cd src