diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-01-30 13:45:05 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-01-30 13:45:05 +0000 |
| commit | c8eca71922244b73a247a19e3db183a9d9ccda3c (patch) | |
| tree | dd932e95596dcf9bef73bd66f9c27a8c16a75768 | |
| parent | 4bcec9a2c75700e57ac150e693762e11866d9ee5 (diff) | |
| download | emacs-c8eca71922244b73a247a19e3db183a9d9ccda3c.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.
| -rw-r--r-- | nt/ChangeLog | 11 | ||||
| -rwxr-xr-x | nt/configure.bat | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index d14531a5bfb..7f434dc0966 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,14 @@ +2001-01-30 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * INSTALL: Copy the table of tested combinations of development
+ tools from confuigure.bat. Add suggestion to install Bash on
+ Windows 9X.
+
+ * configure.bat: 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.
+
2001-01-24 Andrew Innes <andrewi@gnu.org>
* makefile.w32-in (cleanall-other-dirs-nmake):
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.
|