Changed load-path look a little.

[gnu-emacs] / config.bat

diff --git a/config.bat b/config.bat
index 5b8cc2a6cd6d854c0ae5a5a61cfe947718e5ba12..dfd7505d39d154e2fb082726b4a22b936f5a13df 100644 (file)
--- 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.\r
 \r
 rem   You should have received a copy of the GNU General Public License\r
-rem   along with GNU Emacs; see the file COPYING.  If not, write to\r
-rem   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.\r
+rem   along with GNU Emacs; see the file COPYING.  If not, write to the\r
+rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
+rem   Boston, MA 02111-1307, USA.\r
 rem   ----------------------------------------------------------------------\r
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
@@ -37,7 +38,7 @@ rem   traffic.
 rem   ----------------------------------------------------------------------\r
 set X11=\r
 set nodebug=\r
-set djgpp-ver=\r
+set djgpp_ver=\r
 :again\r
 if "%1" == "" goto usage\r
 if "%1" == "--with-x" goto withx\r
@@ -74,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
@@ -89,7 +90,7 @@ Echo To configure 'Emacs' you need to have 'gcc'!
 rm -f junk.c\r
 Goto End\r
 :gccOk\r
-rm -f junk.c junk.o\r
+rm -f junk.c junk.o junk junk.exe\r
 Echo Checking what version of DJGPP is installed...\r
 If Not "%DJGPP%" == "" goto djgppOk\r
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
@@ -105,17 +106,18 @@ echo #else               >>junk.c
 echo {return 0;}         >>junk.c\r
 echo #endif              >>junk.c\r
 echo #endif              >>junk.c\r
-gcc -o junk.exe junk.c\r
+gcc -o junk junk.c\r
+if not exist junk.exe coff2exe junk\r
 junk\r
 If ErrorLevel 10 Goto go32Ok\r
 rm -f junk.c junk junk.exe\r
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
 Goto End\r
 :go32Ok\r
-set djgpp-ver=1\r
-If ErrorLevel 20 set djgpp-ver=2\r
+set djgpp_ver=1\r
+If ErrorLevel 20 set djgpp_ver=2\r
 rm -f junk.c junk junk.exe\r
-Echo Configuring for DJGPP Version %DJGPP-VER% ...\r
+Echo Configuring for DJGPP Version %DJGPP_VER% ...\r
 Rem   ----------------------------------------------------------------------\r
 Echo Configuring the source directory...\r
 cd src\r
@@ -141,7 +143,7 @@ if exist dir.h ren dir.h vmsdir.h
 rem   Create "makefile" from "makefile.in".\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
+If "%DJGPP_VER%" == "1" Goto mfV1\r
 gcc -E junk.c | sed -f ../msdos/sed1v2.inp >makefile\r
 goto mfDone\r
 :mfV1\r
@@ -167,7 +169,7 @@ cd lib-src
 rem   Create "makefile" from "makefile.in".\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
+If "%DJGPP_VER%" == "2" goto libsrc-v2\r
 sed -f ../msdos/sed3.inp <makefile.new >makefile\r
 Goto libsrc2\r
 :libsrc-v2\r
@@ -193,10 +195,24 @@ cd ..
 :oldx1\r
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the main directory...\r
-If "%DJGPP-VER%" == "2" copy msdos\mainmake.v2 makefile >nul\r
-If "%DJGPP-VER%" == "1" copy msdos\mainmake makefile >nul\r
+If "%DJGPP_VER%" == "1" goto mainv1\r
+Echo Looking for the GDB init file...\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
+Echo the Emacs distribution, but was probably renamed to some other\r
+Echo name without the leading dot when you untarred the archive.\r
+Echo It should be in the "src/" subdirectory.  Please make sure this\r
+Echo file exists and is called "_gdbinit" with a leading underscore.\r
+Echo Then run CONFIG.BAT again with the same arguments you did now.\r
+goto End\r
+:gdbinitOk\r
+Echo Looking for the GDB init file...found\r
+copy msdos\mainmake.v2 makefile >nul\r
+:mainv1\r
+If "%DJGPP_VER%" == "1" copy msdos\mainmake makefile >nul\r
 rem   ----------------------------------------------------------------------\r
 :end\r
 set X11=\r
 set nodebug=\r
-set djgpp-ver=\r
+set djgpp_ver=\r