(dontCopy): Rename admin/unidata/Makefile to keep it out of the way of

Windows generated file.  Generate admin/unidata/makefile.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index de148f9fe7f3090b7aa59aa6ba3609c23c55b01d..4101122769a25b3d2090493f5e3203deff9124c8 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-02  Eli Zaretskii  <eliz@gnu.org>
 
+       * 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 9f51e1dc57e96cce5e1d9da69f87fc930b6bd5b8..24719c678639e6724250ec7caed33c86f6cc04b8 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -523,6 +523,8 @@ copy paths.h ..\src\epaths.h
 :dontCopy\r
 if exist config.tmp del config.tmp\r
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile\r
+if exist ..\admin\unidata\Makefile if not exist ..\admin\unidata\Makefile.unix ren ..\admin\unidata\Makefile Makefile.unix\r
+if exist ..\admin\unidata copy /b config.settings+%MAKECMD%.defs+..\admin\unidata\makefile.w32-in ..\admin\unidata\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
 copy /b config.settings+%MAKECMD%.defs+..\doc\emacs\makefile.w32-in ..\doc\emacs\makefile\r