Replace file name scan-gram-c.c with scangram-c.c and

scan-skel-c.c with /src/scanskel-c.c to conform with
the 8.3 file name restriction on MSDOS.

diff --git a/djgpp/config.bat b/djgpp/config.bat
index df9e508c1385a9ae4017febe853c16d351d85eb5..abcdaee6de92c43423790ee355d1df18b7f11d0c 100644 (file)
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -1,4 +1,7 @@
 @echo off\r
 @echo off\r

+Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line\r
+Rem format, or else stock DOS/Windows shells will refuse to run it.\r
+\r

 echo Configuring GNU Bison for DJGPP v2.x...\r
 \r
 Rem The SmallEnv tests protect against fixed and too small size\r
 echo Configuring GNU Bison for DJGPP v2.x...\r
 \r
 Rem The SmallEnv tests protect against fixed and too small size\r


@@ -169,7 +172,18 @@ 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
 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

-\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
+test -f %XSRC%/src/scan-gram-c.c\r
+if not errorlevel 1 mv -f %XSRC%/src/scan-gram-c.c %XSRC%/src/c-scan-gram.c\r
+:scan_skel_c_Test\r
+test -f %XSRC%/src/c-scan-skel.c\r
+if not errorlevel 1 goto FixFiles\r
+test -f %XSRC%/src/scan-skel-c.c\r
+if not errorlevel 1 mv -f %XSRC%/src/scan-skel-c.c %XSRC%/src/c-scan-skel.c\r
+\r
+:FixFiles\r

 Rem Fix data/lalr1.cc and data/location.cc to reflect the renaming of c++.m4\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/lalr1.cc > lalr1.cc\r
 if errorlevel 1 goto lalr1_ccFileError\r
 Rem Fix data/lalr1.cc and data/location.cc to reflect the renaming of c++.m4\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/lalr1.cc > lalr1.cc\r
 if errorlevel 1 goto lalr1_ccFileError\r

diff --git a/djgpp/config.sed b/djgpp/config.sed
index 58316fe5c43fb727bd6e12c66315deffa2981d67..519f2fdeabf55bfd2a97573de6a5a1ab44c6c162 100644 (file)
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -10,6 +10,8 @@
   s,c++\\.at,cxx.at,g;t t\
   s,c++\\.m4,cxx.m4,g;t t\
   s,calc++,calcxx,g;t t\
   s,c++\\.at,cxx.at,g;t t\
   s,c++\\.m4,cxx.m4,g;t t\
   s,calc++,calcxx,g;t t\

+  s,scan-gram-c,c-scan-gram,g;t t\
+  s,scan-skel-c,c-scan-skel,g;t t\

   s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
   s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
   s,(MAKEINFOFLAGS),& --no-split,\
   s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
   s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
   s,(MAKEINFOFLAGS),& --no-split,\