Minor fixes in the last commit wrt MS-DOS build.

 config.bat: Fix EOL format in lines modified by last commit.

 msdos/INSTALL: Fix last change.

diff --git a/ChangeLog b/ChangeLog
index bfdef69294cc58febf150a5ed98ab1398f965e2c..79df19400010d4e1271318f0ae5a676315e1f276 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * config.bat: Fix EOL format in lines modified by last commit.
+
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
        * make-dist (files): Remove msdos/is_exec.c and sigaction.c.

diff --git a/config.bat b/config.bat
index 6d3210af70e9754d5af8cd69950c4d44d9dc27ae..bbfe396c41fbc2499def6f702d8b870525d1ad4a 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -19,13 +19,13 @@ rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
 \r
 rem   ----------------------------------------------------------------------\r
-rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r\r
-rem\r\r
-rem   + msdos version 3 or better.\r\r
-rem   + DJGPP version 2.02 or later (version 2.03 or later recommended).\r\r
-rem   + make utility that allows breaking of the 128 chars limit on\r\r
-rem     command lines.  ndmake (as of version 4.5) won't work due to a\r\r
-rem     line length limit.  The make that comes with DJGPP does work (and is\r\r
+rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
+rem\r
+rem   + msdos version 3 or better.\r
+rem   + DJGPP version 2.02 or later (version 2.03 or later recommended).\r
+rem   + make utility that allows breaking of the 128 chars limit on\r
+rem     command lines.  ndmake (as of version 4.5) won't work due to a\r
+rem     line length limit.  The make that comes with DJGPP does work (and is\r
 rem     recommended).\r
 rem   + rm, mv, and cp (from GNU file utilities).\r
 rem   + sed (you can use the port that comes with DJGPP).\r
@@ -106,13 +106,13 @@ Echo Checking what version of DJGPP is installed...
 If Not "%DJGPP%" == "" goto djgppOk\r
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
 Goto End\r
-:djgppOk\r\r
-echo int main()           >junk.c\r\r
-echo #ifdef __DJGPP__    >>junk.c\r\r
-echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c\r\r
-echo #else               >>junk.c\r\r
-echo #ifdef __GO32__     >>junk.c\r\r
-echo {return 10;}         >>junk.c\r\r
+:djgppOk\r
+echo int main()           >junk.c\r
+echo #ifdef __DJGPP__    >>junk.c\r
+echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c\r
+echo #else               >>junk.c\r
+echo #ifdef __GO32__     >>junk.c\r
+echo {return 10;}         >>junk.c\r
 echo #else               >>junk.c\r
 echo {return 0;}         >>junk.c\r
 echo #endif              >>junk.c\r
@@ -123,21 +123,21 @@ junk
 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\r
-:go32Ok\r\r
-set djgpp_ver=2\r\r
-If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!\r\r
-If Not ErrorLevel 22 Goto End\r\r
-rm -f junk.c junk junk.exe\r\r
-rem DJECHO is used by the top-level Makefile in the v2.x build\r\r
-Echo Checking whether 'djecho' is available...\r\r
+Goto End\r
+:go32Ok\r
+set djgpp_ver=2\r
+If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!\r
+If Not ErrorLevel 22 Goto End\r
+rm -f junk.c junk junk.exe\r
+rem DJECHO is used by the top-level Makefile in the v2.x build\r
+Echo Checking whether 'djecho' is available...\r
 redir -o Nul -eo djecho -o junk.$$$ foo\r
-If Exist junk.$$$ Goto djechoOk\r\r
-Echo To build 'Emacs' you need the 'djecho.exe' program!\r\r
-Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.\r\r
-Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,\r\r
-Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.\r\r
-Echo Then run CONFIG.BAT again with the same arguments you did now.\r\r
+If Exist junk.$$$ Goto djechoOk\r
+Echo To build 'Emacs' you need the 'djecho.exe' program!\r
+Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.\r
+Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,\r
+Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.\r
+Echo Then run CONFIG.BAT again with the same arguments you did now.\r
 Goto End\r
 :djechoOk\r
 rm -f junk.$$$\r

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 709e68fc849455113e6aeb67b4c6f0b44930db5d..9a84c907cf58fc621c1a10c035a03b91f3ebc0bf 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * INSTALL: Fix last change.
+
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
        * sed2v2.inp: Remove support for DJGPP 2.01.

diff --git a/msdos/INSTALL b/msdos/INSTALL
index 1521a5078a41c9eeeb94ec2b5bf06d3c13c55893..cba9f651b72454746773b72a454054946dd26864 100644 (file)
--- a/msdos/INSTALL
+++ b/msdos/INSTALL
@@ -12,7 +12,7 @@ supported (e.g., with a specialized driver such as doslfn).
 
 To build and install the DJGPP port, you need to have the DJGPP ports
 of GCC (the GNU C compiler), GNU Make, rm, mv, cp, and sed, and
-version 2.03 or later of DJGPP itself.  See the remarks in CONFIG.BAT
+version 2.02 or later of DJGPP itself.  See the remarks in CONFIG.BAT
 for more information about locations and versions.  The Emacs FAQ (see
 info/efaq.info) includes pointers to Internet sites where you can find
 the necessary utilities; search for "MS-DOS".  The configuration step