* config.bat: Reflect the renaming of c++-skel.m4 into cxx-skel.m4.

[bison.git] / djgpp / config.bat

diff --git a/djgpp/config.bat b/djgpp/config.bat
index 36ce75c6b88c2c03514d22359b702dc7b47e61c0..aee4b55d9a7e7e1c8ddc2103d139ac7072f1bb0f 100644 (file)
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -209,6 +209,11 @@ test -f %XSRC%/data/c++.m4
 if not errorlevel 1 mv -f %XSRC%/data/c++.m4 %XSRC%/data/cxx.m4\r
 test -f %XSRC%/data/cxx.m4\r
 if errorlevel 1 mv -f %XSRC%/data/cpp.m4 %XSRC%/data/cxx.m4\r
+test -f %XSRC%/data/c++-skel.m4\r
+if not errorlevel 1 mv -f %XSRC%/data/c++-skel.m4 %XSRC%/data/cxx-skel.m4\r
+test -f %XSRC%/data/cxx-skel.m4\r
+if errorlevel 1 mv -f %XSRC%/data/cpp-skel.m4 %XSRC%/data/cxx-skel.m4\r
+\r
 :scan_gram_c_Test\r
 test -f %XSRC%/src/c-scan-gram.c\r
 if not errorlevel 1 goto scan_skel_c_Test\r
@@ -226,12 +231,17 @@ sed "s/c++\.m4/cxx.m4/" %XSRC%/data/lalr1.cc > lalr1.cc
 if errorlevel 1 goto lalr1_ccFileError\r
 mv ./lalr1.cc %XSRC%/data/lalr1.cc\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/location.cc > location.cc\r
-if errorlevel 1 goto location.ccFileError\r
+if errorlevel 1 goto location_ccFileError\r
 mv ./location.cc %XSRC%/data/location.cc\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/glr.cc > glr.cc\r
-if errorlevel 1 goto glr.ccFileError\r
+if errorlevel 1 goto glr_ccFileError\r
 mv ./glr.cc %XSRC%/data/glr.cc\r
 \r
+Rem Fix src/getargs.c to reflect the renaming of c++-skel.m4\r
+sed "s/c++-skel\.m4/cxx-skel.m4/" %XSRC%/src/getargs.c > getargs.c\r
+if errorlevel 1 goto getargs_cFileError\r
+mv ./getargs.c %XSRC%/src/getargs.c\r
+\r
 Rem Define DJGPP specific defs in config.hin\r
 echo Editing config.hin...\r
 test -f %XSRC%/lib/config_h.org\r
@@ -245,6 +255,12 @@ Rem Fixing ilicit testsuite file name.
 test -f %XSRC%/tests/c++.at\r
 if not errorlevel 1 mv -f %XSRC%/tests/c++.at %XSRC%/tests/cxx.at\r
 \r
+test -f %XSRC%/tests/testsuite.org\r
+if errorlevel 1 update %XSRC%/tests/testsuite %XSRC%/tests/testsuite.org\r
+sed -f %XSRC%/djgpp/testsuite.sed %XSRC%/tests/testsuite.org > testsuite.tmp\r
+if errorlevel 1 goto SedError3\r
+mv -f ./testsuite.tmp %XSRC%/tests/testsuite\r
+\r
 Rem Fixing ilicit calc++ file names in the calc++ directory.\r
 test -d %XSRC%/examples/calc++\r
 if not errorlevel 1 mv -f %XSRC%/examples/calc++ %XSRC%/examples/calcxx\r
@@ -442,6 +458,10 @@ goto End
 echo ./data/glr.cc file editing failed!\r
 goto End\r
 \r
+:getargs_cFileError\r
+echo ./src/getargs.c file editing failed!\r
+goto End\r
+\r
 :location_ccFileError\r
 echo ./data/location.cc file editing failed!\r
 goto End\r
@@ -459,7 +479,11 @@ echo ./configure script editing failed!
 goto End\r
 \r
 :SedError2\r
-echo ./config.hin editing failed!\r
+echo ./lib/config.hin editing failed!\r
+goto End\r
+\r
+:SedError3\r
+echo ./tests/testsuite editing failed!\r
 goto End\r
 \r
 :CfgError\r