summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-07-28 22:41:44 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-07-28 22:41:44 +0000
commit5dac561545414aee1af7cbc1f915c0840a44a532 (patch)
tree3f9393a374f1302c38d015ac9ed19b103be4f2b5 /nt
parent94f659bb02e80a5d69b2c3d4c8f9ad1541838a57 (diff)
downloademacs-5dac561545414aee1af7cbc1f915c0840a44a532.tar.gz
Don't create lisp/Makefile.unix.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rwxr-xr-xnt/configure.bat3
2 files changed, 5 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index cff8987af3b..c3dec7b121b 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-29 Juanma Barranquero <lekktu@gmail.com>
+
+ * configure.bat: Don't create lisp/Makefile.unix.
+
2005-07-28 Juanma Barranquero <lekktu@gmail.com>
* .cvsignore: Add `makefile' and `config.log'.
diff --git a/nt/configure.bat b/nt/configure.bat
index bf78ed52bbe..b5f78f2ab51 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
-rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
rem Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
@@ -499,7 +499,6 @@ copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile
copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile
copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile
-if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
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.