diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2008-02-02 15:06:00 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2008-02-02 15:06:00 +0000 |
| commit | a392138fa39a02bacc31e11192fae2a72d3378f5 (patch) | |
| tree | 0090a013139b7a4d09e3df52231d200221668563 /nt | |
| parent | ef764ddd1d775ef7a98e65dc6aaf5bbad105a048 (diff) | |
| download | emacs-a392138fa39a02bacc31e11192fae2a72d3378f5.tar.gz | |
(dontCopy): Rename admin/unidata/Makefile to keep it out of the way of
Windows generated file. Generate admin/unidata/makefile.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rwxr-xr-x | nt/configure.bat | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index de148f9fe7f..4101122769a 100644 --- 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 9f51e1dc57e..24719c67863 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
|