Simplify using new names file names src/makefile.in,

config.in, paths.in.  Change Echo commands not to use `.

diff --git a/config.bat b/config.bat
index 446060c186e25eed56610b60eb441486368ce63b..3f838c814306ee7436c627d9de563065cd5f6225 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -57,33 +57,33 @@ shift
 goto again\r
 rem   ----------------------------------------------------------------------\r
 :msdos\r
-Echo Checking whether `sed' is available...\r
-Sed -e "w junk.$$$" <Nul\r
+Echo Checking whether 'sed' is available...\r
+sed -e "w junk.$$$" <Nul\r
 If Exist junk.$$$ Goto sedOk\r
-Echo To configure `Emacs' you need to have `sed'!\r
+Echo To configure 'Emacs' you need to have 'sed'!\r
 Goto End\r
 :sedOk\r
-Echo Checking whether `rm' is available...\r
+Echo Checking whether 'rm' is available...\r
 rm -f junk.$$$\r
 If Not Exist junk.$$$ Goto rmOk\r
-Echo To configure `Emacs' you need to have `rm'!\r
+Echo To configure 'Emacs' you need to have 'rm'!\r
 Goto End\r
 :rmOk\r
-Echo Checking whether `mv' is available...\r
+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
 If Exist junk.2 Goto mvOk\r
-Echo To configure `Emacs' you need to have `mv'!\r
+Echo To configure 'Emacs' you need to have 'mv'!\r
 rm -f junk.1\r
 Goto End\r
 :mvOk\r
 rm -f junk.2\r
-Echo Checking whether `gcc' is available...\r
+Echo Checking whether 'gcc' is available...\r
 echo main(){} >junk.c\r
 gcc -c junk.c\r
 if exist junk.o goto gccOk\r
-Echo To configure `Emacs' you need to have `gcc'!\r
+Echo To configure 'Emacs' you need to have 'gcc'!\r
 rm -f junk.c\r
 Goto End\r
 :gccOk\r
@@ -91,41 +91,17 @@ rm -f junk.c junk.o
 Rem   ----------------------------------------------------------------------\r
 Echo Configuring the source directory...\r
 cd src\r
-set PATHSH=paths-h.in\r
-if exist %PATHSH% goto src1\r
-set PATHSH=paths.h-in\r
-if exist %PATHSH% goto src1\r
-echo config: *** The file originally called "src/paths.h.in" cannot be found.\r
-cd ..\r
-goto end\r
-:src1\r
-set CONFIGH=config-h.in\r
-if exist %CONFIGH% goto src2\r
-set CONFIGH=config.h-in\r
-if exist %CONFIGH% goto src2\r
-echo config: *** The file originally called "src/config.h.in" cannot be found.\r
-cd ..\r
-goto end\r
-:src2\r
-set MAKEFILEIN=makefile.in-in\r
-if exist %MAKEFILEIN% goto src3\r
-set MAKEFILEIN=makefile-in.in\r
-if exist %MAKEFILEIN% goto src3\r
-echo makefile: *** The file originally called "src/makefile.in.in" cannot be found.\r
-cd ..\r
-goto end\r
-:src3\r
 \r
 rem   Create "paths.h"\r
-sed -f ../msdos/sed4.inp <%PATHSH% >paths.tmp\r
+sed -f ../msdos/sed4.inp <paths.in >paths.tmp\r
 update paths.tmp paths.h >nul\r
 rm -f paths.tmp\r
 \r
 rem   Create "config.h"\r
 rm -f config.h2 config.tmp\r
-cp %CONFIGH% config.tmp\r
+cp config.in config.tmp\r
 if "%X11%" == "" goto src4\r
-sed -f ../msdos/sed2x.inp <%CONFIGH% >config.tmp\r
+sed -f ../msdos/sed2x.inp <config.in >config.tmp\r
 :src4\r
 sed -f ../msdos/sed2.inp <config.tmp >config.h2\r
 update config.h2 config.h >nul\r
@@ -134,11 +110,12 @@ rm -f config.tmp config.h2
 rem   On my system dir.h gets in the way.  It's a VMS file so who cares.\r
 if exist dir.h ren dir.h vmsdir.h\r
 \r
-rem   Create "makefile" from "makefile.in.in".\r
+rem   Create "makefile" from "makefile.in".\r
 rm -f makefile junk.c\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <%MAKEFILEIN% >junk.c\r
+sed -e "1,/cpp stuff/s@^# .*$@@" <makefile.in >junk.c\r
 gcc -E junk.c | sed -f ../msdos/sed1.inp >makefile\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
@@ -153,17 +130,9 @@ cd ..
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the library source directory...\r
 cd lib-src\r
-set MAKEFILEIN=makefile.in-in\r
-if exist %MAKEFILEIN% goto libsrc1\r
-set MAKEFILEIN=makefile-in.in\r
-if exist %MAKEFILEIN% goto libsrc1\r
-echo makefile: *** The file originally called "lib-src/Makefile.in.in" cannot be found.\r
-cd ..\r
-goto end\r
-:libsrc1\r
 rem   Create "makefile" from "makefile.in".\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <%MAKEFILEIN% >junk.c\r
-gcc -E -I. -I../src junk.c | sed -e "s/^ /     /" -e "/^#/d" -e "/^[   \f]*$/d" >Makefile.new\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
 sed -f ../msdos/sed3.inp <makefile.new >makefile\r
 rm -f makefile.new junk.c\r
 if "%nodebug%" == "" goto libsrc2\r
@@ -189,6 +158,3 @@ rem   ----------------------------------------------------------------------
 :end\r
 set X11=\r
 set nodebug=\r
-set MAKEFILEIN=\r
-set PATHSH=\r
-set CONFIGH=\r