Fix previous change.

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index 8f8b4b6..f127d00 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -75,7 +75,7 @@ Goto End
 Echo Checking whether 'mv' is available...\r
 rm -f junk.1 junk.2\r
 echo foo >junk.1\r
-mv junk.1 junk.2\r
+mv junk.1 ./junk.2\r
 If Exist junk.2 Goto mvOk\r
 Echo To configure 'Emacs' you need to have 'mv'!\r
 rm -f junk.1\r
@@ -129,7 +129,7 @@ rm -f paths.tmp
 \r
 rem   Create "config.h"\r
 rm -f config.h2 config.tmp\r
-cp config.in config.tmp\r
+sed -e '' config.in > config.tmp\r
 if "%X11%" == "" goto src4\r
 sed -f ../msdos/sed2x.inp <config.in >config.tmp\r
 :src4\r
@@ -141,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\r
 \r
 rem   Create "makefile" from "makefile.in".\r
-rm -f makefile junk.c\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <makefile.in >junk.c\r
+rm -f Makefile junk.c\r
+sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c\r
 If "%DJGPP_VER%" == "1" Goto mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1v2.inp >makefile\r
+gcc -E junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
 goto mfDone\r
 :mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1.inp >makefile\r
+gcc -E junk.c | sed -f ../msdos/sed1.inp >Makefile\r
 :mfDone\r
 rm -f junk.c\r
 \r
 if "%X11%" == "" goto src5\r
-mv makefile makefile.tmp\r
-sed -f ../msdos/sed1x.inp <makefile.tmp >makefile\r
+mv Makefile makefile.tmp\r
+sed -f ../msdos/sed1x.inp <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :src5\r
 \r
 if "%nodebug%" == "" goto src6\r
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp\r
-sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >makefile\r
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :src6\r
 cd ..\r
@@ -167,18 +167,18 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...\r
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <makefile.in >junk.c\r
+sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c\r
 gcc -E -I. -I../src junk.c | sed -e "s/^ /     /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
 If "%DJGPP_VER%" == "2" goto libsrc-v2\r
-sed -f ../msdos/sed3.inp <makefile.new >makefile\r
+sed -f ../msdos/sed3.inp <makefile.new >Makefile\r
 Goto libsrc2\r
 :libsrc-v2\r
-sed -f ../msdos/sed3v2.inp <makefile.new >makefile\r
+sed -f ../msdos/sed3v2.inp <makefile.new >Makefile\r
 :libsrc2\r
 rm -f makefile.new junk.c\r
 if "%nodebug%" == "" goto libsrc3\r
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp\r
-sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >makefile\r
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :libsrc3\r
 cd ..\r
@@ -186,17 +186,23 @@ rem   ----------------------------------------------------------------------
 if "%X11%" == "" goto oldx1\r
 Echo Configuring the oldxmenu directory...\r
 cd oldxmenu\r
-sed -f ../msdos/sed5x.inp <makefile.in >makefile\r
+sed -f ../msdos/sed5x.inp <Makefile.in >Makefile\r
 if "%nodebug%" == "" goto oldx2\r
-sed -e "/^CFLAGS *=/s/ *-g//" <makefile >makefile.tmp\r
-mv -f makefile.tmp makefile\r
+sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+mv -f makefile.tmp Makefile\r
 :oldx2\r
 cd ..\r
 :oldx1\r
 rem   ----------------------------------------------------------------------\r
+Echo Configuring the manual directory...\r
+cd man\r
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
+cd ..\r
+rem   ----------------------------------------------------------------------\r
 Echo Configuring the main directory...\r
 If "%DJGPP_VER%" == "1" goto mainv1\r
 Echo Looking for the GDB init file...\r
+If not Exist src\_gdbinit If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
 If Exist src\_gdbinit goto gdbinitOk\r
 Echo ERROR:\r
 Echo I cannot find the GDB init file.  It was called ".gdbinit" in\r
@@ -208,9 +214,9 @@ 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
-copy msdos\mainmake.v2 makefile >nul\r
+copy msdos\mainmake.v2 Makefile >nul\r
 :mainv1\r
-If "%DJGPP_VER%" == "1" copy msdos\mainmake makefile >nul\r
+If "%DJGPP_VER%" == "1" copy msdos\mainmake Makefile >nul\r
 rem   ----------------------------------------------------------------------\r
 :end\r
 set X11=\r