summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2001-01-30 13:43:35 +0000
committerEli Zaretskii <eliz@gnu.org>2001-01-30 13:43:35 +0000
commit51ef0a0171a48215d1af4c6b96f449772e181fd5 (patch)
treefa1a4bd8f708cc65f37ffdb06a9f511d2fb78be5
parentdc3446d88d12da47dfceaeb81ead0d833c4a2227 (diff)
downloademacs-51ef0a0171a48215d1af4c6b96f449772e181fd5.tar.gz
Don't copy lisp/Makefile, it doesn't exist; copy
lisp/Makefile.in instead. Use "rm -f" where more than one file needs to be deleted, since command.com in Windows 9X doesn't grok more than one argument.
-rwxr-xr-xnt/configure.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/nt/configure.bat b/nt/configure.bat
index 8abb58c7ebc..11697a4a645 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -187,7 +187,7 @@ gcc -c junk.c
if not exist junk.o goto checkw32api
gcc -mno-cygwin -c junk.c
if exist junk.o set nocygwin=Y
-del junk.o junk.c
+rm -f junk.c junk.o
:checkw32api
rem ----------------------------------------------------------------------
@@ -216,13 +216,13 @@ goto end
:gccOk
set COMPILER=gcc
-del junk.c junk.o
+rm -f junk.c junk.o
echo Using 'gcc'
goto genmakefiles
:clOk
set COMPILER=cl
-del junk.c junk.obj
+rm -f junk.c junk.obj
echo Using 'MSVC'
goto genmakefiles
@@ -252,7 +252,7 @@ copy paths.h ..\src\epaths.h
copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
-if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile Makefile.unix
+if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
if exist ..\lisp\makefile del /f ..\lisp\makefile
copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
rem Use the default (no-op) Makefile.in if the nt version is not present.