X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/809e1789ed431e6fb67b12b496cec4f5eae42479..c5059c2cf2ca8505d084574e014053659d62e3e0:/config.bat

diff --git a/config.bat b/config.bat
index 24cfdb17c7..f127d00750 100644
--- a/config.bat
+++ b/config.bat
@@ -16,8 +16,9 @@ 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
-rem   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+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   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem
@@ -74,7 +75,7 @@ Goto End
 Echo Checking whether 'mv' is available...
 rm -f junk.1 junk.2
 echo foo >junk.1
-mv junk.1 junk.2
+mv junk.1 ./junk.2
 If Exist junk.2 Goto mvOk
 Echo To configure 'Emacs' you need to have 'mv'!
 rm -f junk.1
@@ -128,7 +129,7 @@ rm -f paths.tmp
 
 rem   Create "config.h"
 rm -f config.h2 config.tmp
-cp config.in config.tmp
+sed -e '' config.in > config.tmp
 if "%X11%" == "" goto src4
 sed -f ../msdos/sed2x.inp <config.in >config.tmp
 :src4
@@ -140,25 +141,25 @@ rem   On my system dir.h gets in the way.  It's a VMS file so who cares.
 if exist dir.h ren dir.h vmsdir.h
 
 rem   Create "makefile" from "makefile.in".
-rm -f makefile junk.c
-sed -e "1,/cpp stuff/s@^# .*$@@" <makefile.in >junk.c
+rm -f Makefile junk.c
+sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c
 If "%DJGPP_VER%" == "1" Goto mfV1
-gcc -E junk.c | sed -f ../msdos/sed1v2.inp >makefile
+gcc -E junk.c | sed -f ../msdos/sed1v2.inp >Makefile
 goto mfDone
 :mfV1
-gcc -E junk.c | sed -f ../msdos/sed1.inp >makefile
+gcc -E junk.c | sed -f ../msdos/sed1.inp >Makefile
 :mfDone
 rm -f junk.c
 
 if "%X11%" == "" goto src5
-mv makefile makefile.tmp
-sed -f ../msdos/sed1x.inp <makefile.tmp >makefile
+mv Makefile makefile.tmp
+sed -f ../msdos/sed1x.inp <makefile.tmp >Makefile
 rm -f makefile.tmp
 :src5
 
 if "%nodebug%" == "" goto src6
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp
-sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >makefile
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp
+sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile
 rm -f makefile.tmp
 :src6
 cd ..
@@ -166,18 +167,18 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...
 cd lib-src
 rem   Create "makefile" from "makefile.in".
-sed -e "1,/cpp stuff/s@^# .*$@@" <makefile.in >junk.c
+sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c
 gcc -E -I. -I../src junk.c | sed -e "s/^ /	/" -e "/^#/d" -e "/^[ 	]*$/d" >makefile.new
 If "%DJGPP_VER%" == "2" goto libsrc-v2
-sed -f ../msdos/sed3.inp <makefile.new >makefile
+sed -f ../msdos/sed3.inp <makefile.new >Makefile
 Goto libsrc2
 :libsrc-v2
-sed -f ../msdos/sed3v2.inp <makefile.new >makefile
+sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
 :libsrc2
 rm -f makefile.new junk.c
 if "%nodebug%" == "" goto libsrc3
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp
-sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >makefile
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp
+sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile
 rm -f makefile.tmp
 :libsrc3
 cd ..
@@ -185,17 +186,23 @@ rem   ----------------------------------------------------------------------
 if "%X11%" == "" goto oldx1
 Echo Configuring the oldxmenu directory...
 cd oldxmenu
-sed -f ../msdos/sed5x.inp <makefile.in >makefile
+sed -f ../msdos/sed5x.inp <Makefile.in >Makefile
 if "%nodebug%" == "" goto oldx2
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp
-mv -f makefile.tmp makefile
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp
+mv -f makefile.tmp Makefile
 :oldx2
 cd ..
 :oldx1
 rem   ----------------------------------------------------------------------
+Echo Configuring the manual directory...
+cd man
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile
+cd ..
+rem   ----------------------------------------------------------------------
 Echo Configuring the main directory...
 If "%DJGPP_VER%" == "1" goto mainv1
 Echo Looking for the GDB init file...
+If not Exist src\_gdbinit If Exist src\.gdbinit update src/.gdbinit src/_gdbinit
 If Exist src\_gdbinit goto gdbinitOk
 Echo ERROR:
 Echo I cannot find the GDB init file.  It was called ".gdbinit" in
@@ -207,9 +214,9 @@ Echo Then run CONFIG.BAT again with the same arguments you did now.
 goto End
 :gdbinitOk
 Echo Looking for the GDB init file...found
-copy msdos\mainmake.v2 makefile >nul
+copy msdos\mainmake.v2 Makefile >nul
 :mainv1
-If "%DJGPP_VER%" == "1" copy msdos\mainmake makefile >nul
+If "%DJGPP_VER%" == "1" copy msdos\mainmake Makefile >nul
 rem   ----------------------------------------------------------------------
 :end
 set X11=