2 files changed, 6 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index de148f9fe7..4101122769 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-02  Eli Zaretskii  <[email protected]>
 
+	* configure.bat (dontCopy): Rename admin/unidata/Makefile to keep
+	it out of the way of Windows generated file.  Generate
+	admin/unidata/makefile.
+
 	* makefile.w32-in (unidatagen-nmake, unidatagen-clean-nmake)
 	(unidatagen-CMD, unidatagen-clean-CMD, unidatagen-SH)
 	(unidatagen-clean-SH): New targets.
diff --git a/nt/configure.bat b/nt/configure.bat
index 9f51e1dc57..24719c6786 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -523,6 +523,8 @@ copy paths.h ..\src\epaths.h
 :dontCopy

 if exist config.tmp del config.tmp

 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile

+if exist ..\admin\unidata\Makefile if not exist ..\admin\unidata\Makefile.unix ren ..\admin\unidata\Makefile Makefile.unix

+if exist ..\admin\unidata copy /b config.settings+%MAKECMD%.defs+..\admin\unidata\makefile.w32-in ..\admin\unidata\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

 copy /b config.settings+%MAKECMD%.defs+..\doc\emacs\makefile.w32-in ..\doc\emacs\makefile