[Emacs-diffs] trunk r117675: Minor fixes in the last commit wrt MS-DOS build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117675
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-08-09 21:48:45 +0300
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  config.bat                     config.bat-20091113204419-o5vbwnq5f7feedwu-652
  msdos/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1535
  msdos/INSTALL                  install-20091113204419-o5vbwnq5f7feedwu-8797

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-09 16:12:33 +0000
+++ b/ChangeLog 2014-08-09 18:48:45 +0000
@@ -1,3 +1,7 @@
+2014-08-09  Eli Zaretskii  <address@hidden>
+
+       * config.bat: Fix EOL format in lines modified by last commit.
+
 2014-08-09  Reuben Thomas  <address@hidden>
 
        * make-dist (files): Remove msdos/is_exec.c and sigaction.c.

=== modified file 'config.bat'
--- a/config.bat        2014-08-09 16:12:33 +0000
+++ b/config.bat        2014-08-09 18:48:45 +0000
@@ -19,13 +19,13 @@
 rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
 
 rem   ----------------------------------------------------------------------
-rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:

-rem

-rem   + msdos version 3 or better.

-rem   + DJGPP version 2.02 or later (version 2.03 or later recommended).

-rem   + make utility that allows breaking of the 128 chars limit on

-rem     command lines.  ndmake (as of version 4.5) won't work due to a

-rem     line length limit.  The make that comes with DJGPP does work (and is

+rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
+rem
+rem   + msdos version 3 or better.
+rem   + DJGPP version 2.02 or later (version 2.03 or later recommended).
+rem   + make utility that allows breaking of the 128 chars limit on
+rem     command lines.  ndmake (as of version 4.5) won't work due to a
+rem     line length limit.  The make that comes with DJGPP does work (and is
 rem     recommended).
 rem   + rm, mv, and cp (from GNU file utilities).
 rem   + sed (you can use the port that comes with DJGPP).
@@ -106,13 +106,13 @@
 If Not "%DJGPP%" == "" goto djgppOk
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
 Goto End
-:djgppOk

-echo int main()           >junk.c

-echo #ifdef __DJGPP__    >>junk.c

-echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c

-echo #else               >>junk.c

-echo #ifdef __GO32__     >>junk.c

-echo {return 10;}         >>junk.c

+:djgppOk
+echo int main()           >junk.c
+echo #ifdef __DJGPP__    >>junk.c
+echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c
+echo #else               >>junk.c
+echo #ifdef __GO32__     >>junk.c
+echo {return 10;}         >>junk.c
 echo #else               >>junk.c
 echo {return 0;}         >>junk.c
 echo #endif              >>junk.c
@@ -123,21 +123,21 @@
 If ErrorLevel 10 Goto go32Ok
 rm -f junk.c junk junk.exe
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
-Goto End

-:go32Ok

-set djgpp_ver=2

-If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!

-If Not ErrorLevel 22 Goto End

-rm -f junk.c junk junk.exe

-rem DJECHO is used by the top-level Makefile in the v2.x build

-Echo Checking whether 'djecho' is available...

+Goto End
+:go32Ok
+set djgpp_ver=2
+If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!
+If Not ErrorLevel 22 Goto End
+rm -f junk.c junk junk.exe
+rem DJECHO is used by the top-level Makefile in the v2.x build
+Echo Checking whether 'djecho' is available...
 redir -o Nul -eo djecho -o junk.$$$ foo
-If Exist junk.$$$ Goto djechoOk

-Echo To build 'Emacs' you need the 'djecho.exe' program!

-Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.

-Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,

-Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.

-Echo Then run CONFIG.BAT again with the same arguments you did now.

+If Exist junk.$$$ Goto djechoOk
+Echo To build 'Emacs' you need the 'djecho.exe' program!
+Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.
+Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,
+Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.
+Echo Then run CONFIG.BAT again with the same arguments you did now.
 Goto End
 :djechoOk
 rm -f junk.$$$

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2014-08-09 16:12:33 +0000
+++ b/msdos/ChangeLog   2014-08-09 18:48:45 +0000
@@ -1,3 +1,7 @@
+2014-08-09  Eli Zaretskii  <address@hidden>
+
+       * INSTALL: Fix last change.
+
 2014-08-09  Reuben Thomas  <address@hidden>
 
        * sed2v2.inp: Remove support for DJGPP 2.01.

=== modified file 'msdos/INSTALL'
--- a/msdos/INSTALL     2014-08-09 16:12:33 +0000
+++ b/msdos/INSTALL     2014-08-09 18:48:45 +0000
@@ -12,7 +12,7 @@
 
 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