X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/60c49bc1a32bda15ae6751dcefc3d79fca9381b6..5412419465dbb3e12d0841ab15875fa34ca6f336:/config.bat

diff --git a/config.bat b/config.bat
index 5417513ea7..c007e0c8cd 100644
--- a/config.bat
+++ b/config.bat
@@ -1,15 +1,15 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MSDOS
-rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004
-rem   Free Software Foundation, Inc.
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
+rem   2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
-rem   GNU Emacs is free software; you can redistribute it and/or modify
+rem   GNU Emacs is free software: you can redistribute it and/or modify
 rem   it under the terms of the GNU General Public License as published by
-rem   the Free Software Foundation; either version 2, or (at your option)
-rem   any later version.
+rem   the Free Software Foundation, either version 3 of the License, or
+rem   (at your option) any later version.
 
 rem   GNU Emacs is distributed in the hope that it will be useful,
 rem   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +17,8 @@ rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem   GNU General Public License for more details.
 
 rem   You should have received a copy of the GNU General Public License
-rem   along with GNU Emacs; see the file COPYING.  If not, write to the
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem   Boston, MA 02111-1307, USA.
+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
+
 rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem
@@ -161,8 +160,9 @@ sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
 Rem See if DECL_ALIGN can be supported with this GCC
 rm -f junk.c junk.o junk junk.exe
 echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo;  >junk.c
-rem Two percent signs because it is a special character for COMMAND.COM
-echo int main(void) { return (unsigned long)&foo %% 8; }             >>junk.c
+rem Two percent signs because it is a special character for COMMAND.COM/CMD
+rem Filter thru Sed because "&" is special for CMD.EXE
+echo int main(void) { return (unsigned long)"&"foo %% 8; } | sed "s/.&./\&/"         >>junk.c
 gcc -o junk junk.c
 if not exist junk.exe coff2exe junk
 junk
@@ -234,22 +234,11 @@ mv -f makefile.tmp Makefile
 cd ..
 :oldx1
 rem   ----------------------------------------------------------------------
-Echo Configuring the manual directory...
-cd man
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile
-cd ..
-rem   ----------------------------------------------------------------------
-Echo Configuring the ELisp manual directory...
-cd lispref
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile
-cd ..
-rem   ----------------------------------------------------------------------
-Echo Configuring the ELisp Introduction manual directory...
-Rem The two variants for the line below is for when the shell
+Echo Configuring the doc directory...
+cd doc
+Rem The two variants for lispintro below is for when the shell
 Rem supports long file names but DJGPP does not
-if exist lispintro\Makefile.in cd lispintro
-if exist lispintr\Makefile.in cd lispintr
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile
+for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile
 cd ..
 rem   ----------------------------------------------------------------------
 Echo Configuring the lisp directory...