HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optionally avoid that switching to previous or next buffer shows that buffer twice.
[bpt/emacs.git]
/
config.bat
diff --git
a/config.bat
b/config.bat
index
7ebfc74
..
cb66453
100644
(file)
--- a/
config.bat
+++ b/
config.bat
@@
-1,9
+1,7
@@
@echo off
\r
rem ----------------------------------------------------------------------
\r
rem Configuration script for MSDOS
\r
@echo off
\r
rem ----------------------------------------------------------------------
\r
rem Configuration script for MSDOS
\r
-rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
\r
-rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
\r
-rem Inc.
\r
+rem Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
\r
\r
rem This file is part of GNU Emacs.
\r
\r
\r
rem This file is part of GNU Emacs.
\r
\r
@@
-156,9
+154,11
@@
rm -f epaths.tmp
\r
rem Create "config.h"
\r
rm -f config.h2 config.tmp
\r
\r
rem Create "config.h"
\r
rm -f config.h2 config.tmp
\r
-sed -e '' config.in > config.tmp
\r
+if exist config.in sed -e '' config.in > config.tmp
\r
+if exist ..\autogen\config.in sed -e '' ../autogen/config.in > config.tmp
\r
if "%X11%" == "" goto src4
\r
if "%X11%" == "" goto src4
\r
-sed -f ../msdos/sed2x.inp <config.in >config.tmp
\r
+if exist config.in sed -f ../msdos/sed2x.inp < config.in > config.tmp
\r
+if exist ..\autogen\config.in sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp
\r
:src4
\r
sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
\r
Rem See if DECL_ALIGN can be supported with this GCC
\r
:src4
\r
sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
\r
Rem See if DECL_ALIGN can be supported with this GCC
\r
@@
-211,7
+211,7
@@
if exist dir.h ren dir.h vmsdir.h
\r
rem Create "makefile" from "makefile.in".
\r
rm -f Makefile makefile.tmp
\r
\r
rem Create "makefile" from "makefile.in".
\r
rm -f Makefile makefile.tmp
\r
-copy Makefile.in+deps.mk makefile.tmp
\r
+copy Makefile.in+
lisp.mk+
deps.mk makefile.tmp
\r
sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile
\r
rm -f makefile.tmp
\r
\r
sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile
\r
rm -f makefile.tmp
\r
\r
@@
-275,22
+275,29
@@
for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp <
cd ..
\r
rem ----------------------------------------------------------------------
\r
Echo Configuring the lib directory...
\r
cd ..
\r
rem ----------------------------------------------------------------------
\r
Echo Configuring the lib directory...
\r
-If Exist
c++defs.h update c++defs.h
cxxdefs.h
\r
+If Exist
build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/
cxxdefs.h
\r
cd lib
\r
Rem Rename files like djtar on plain DOS filesystem would.
\r
cd lib
\r
Rem Rename files like djtar on plain DOS filesystem would.
\r
-If Exist c++defs.h update c++defs.h cxxdefs.h
\r
+If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h
\r
+If Exist alloca.in.h update alloca.in.h alloca.in-h
\r
If Exist getopt.in.h update getopt.in.h getopt.in-h
\r
If Exist getopt.in.h update getopt.in.h getopt.in-h
\r
-If Exist stddef.in.h update stddef.in.h stddef.in-h
\r
If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
\r
If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
\r
+If Exist signal.in.h update signal.in.h signal.in-h
\r
+If Exist stddef.in.h update stddef.in.h stddef.in-h
\r
+If Exist stdint.in.h update stdint.in.h stdint.in-h
\r
+If Exist stdio.in.h update stdio.in.h stdio.in-h
\r
If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
\r
If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
\r
+If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
\r
If Exist time.in.h update time.in.h time.in-h
\r
If Exist unistd.in.h update unistd.in.h unistd.in-h
\r
If Exist time.in.h update time.in.h time.in-h
\r
If Exist unistd.in.h update unistd.in.h unistd.in-h
\r
-sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
\r
+If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
\r
+If Exist ..\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp
\r
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
\r
rm -f makefile.tmp
\r
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
\r
rm -f makefile.tmp
\r
+Rem Create .Po files for new files in lib/
\r
If Not Exist deps\stamp mkdir deps
\r
If Not Exist deps\stamp mkdir deps
\r
-
If Not Exist deps\stamp
for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
\r
-
If Not Exist deps\stamp
echo deps-stamp > deps\stamp
\r
+for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
\r
+echo deps-stamp > deps\stamp
\r
cd ..
\r
rem ----------------------------------------------------------------------
\r
Echo Configuring the lisp directory...
\r
cd ..
\r
rem ----------------------------------------------------------------------
\r
Echo Configuring the lisp directory...
\r
@@
-322,6
+329,8
@@
Echo Then run CONFIG.BAT again with the same arguments you did now.
goto End
\r
:gdbinitOk
\r
Echo Looking for the GDB init file...found
\r
goto End
\r
:gdbinitOk
\r
Echo Looking for the GDB init file...found
\r
+rem GNUMakefile is not appropriate for MS-DOS so move it out of the way
\r
+If Exist GNUmakefile mv -f GNUmakefile GNUmakefile.unix
\r
copy msdos\mainmake.v2 Makefile >nul
\r
rem ----------------------------------------------------------------------
\r
goto End
\r
copy msdos\mainmake.v2 Makefile >nul
\r
rem ----------------------------------------------------------------------
\r
goto End
\r