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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index d14531a5bfbba88ffbf9d7dcb81a3cced469457c..7f434dc0966e3fa8e8a9217fc6a0c8d862437123 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-30  Eli Zaretskii  <eliz@is.elta.co.il>\r
+\r
+       * INSTALL: Copy the table of tested combinations of development\r
+       tools from confuigure.bat.  Add suggestion to install Bash on\r
+       Windows 9X.\r
+\r
+       * configure.bat: Don't copy lisp/Makefile, it doesn't exist; copy\r
+       lisp/Makefile.in instead.  Use "rm -f" where more than one file\r
+       needs to be deleted, since command.com in Windows 9X doesn't grok\r
+       more than one argument.\r
+\r
 2001-01-24  Andrew Innes  <andrewi@gnu.org>\r
 \r
        * makefile.w32-in (cleanall-other-dirs-nmake): \r

diff --git a/nt/configure.bat b/nt/configure.bat
index 8abb58c7ebcbf8258be8d50d112f13232b0da76a..11697a4a6454f6bc2623c82a3bad4e445c1b883d 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -187,7 +187,7 @@ gcc -c junk.c
 if not exist junk.o goto checkw32api\r
 gcc -mno-cygwin -c junk.c\r
 if exist junk.o set nocygwin=Y\r
-del junk.o junk.c\r
+rm -f junk.c junk.o\r
 \r
 :checkw32api\r
 rem ----------------------------------------------------------------------\r
@@ -216,13 +216,13 @@ goto end
 \r
 :gccOk\r
 set COMPILER=gcc\r
-del junk.c junk.o\r
+rm -f junk.c junk.o\r
 echo Using 'gcc'\r
 goto genmakefiles\r
 \r
 :clOk\r
 set COMPILER=cl\r
-del junk.c junk.obj\r
+rm -f junk.c junk.obj\r
 echo Using 'MSVC'\r
 goto genmakefiles\r
 \r
@@ -252,7 +252,7 @@ copy paths.h ..\src\epaths.h
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile\r
 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile\r
 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile\r
-if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile Makefile.unix\r
+if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix\r
 if exist ..\lisp\makefile del /f ..\lisp\makefile\r
 copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile\r
 rem   Use the default (no-op) Makefile.in if the nt version is not present.\r