mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-22 10:26:20 +00:00
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.
This commit is contained in:
parent
7f3bb475bb
commit
1e0b702b8f
@ -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>
|
2014-08-09 Reuben Thomas <rrt@sc3d.org>
|
||||||
|
|
||||||
* make-dist (files): Remove msdos/is_exec.c and sigaction.c.
|
* make-dist (files): Remove msdos/is_exec.c and sigaction.c.
|
||||||
|
56
config.bat
56
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/.
|
rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
|
||||||
|
|
||||||
rem ----------------------------------------------------------------------
|
rem ----------------------------------------------------------------------
|
||||||
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
|
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
|
||||||
rem
|
rem
|
||||||
rem + msdos version 3 or better.
|
rem + msdos version 3 or better.
|
||||||
rem + DJGPP version 2.02 or later (version 2.03 or later recommended).
|
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 + 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 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 line length limit. The make that comes with DJGPP does work (and is
|
||||||
rem recommended).
|
rem recommended).
|
||||||
rem + rm, mv, and cp (from GNU file utilities).
|
rem + rm, mv, and cp (from GNU file utilities).
|
||||||
rem + sed (you can use the port that comes with DJGPP).
|
rem + sed (you can use the port that comes with DJGPP).
|
||||||
@ -106,13 +106,13 @@ Echo Checking what version of DJGPP is installed...
|
|||||||
If Not "%DJGPP%" == "" goto djgppOk
|
If Not "%DJGPP%" == "" goto djgppOk
|
||||||
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
|
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
|
||||||
Goto End
|
Goto End
|
||||||
:djgppOk
|
:djgppOk
|
||||||
echo int main() >junk.c
|
echo int main() >junk.c
|
||||||
echo #ifdef __DJGPP__ >>junk.c
|
echo #ifdef __DJGPP__ >>junk.c
|
||||||
echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c
|
echo {return (__DJGPP__)*10 + (__DJGPP_MINOR__);} >>junk.c
|
||||||
echo #else >>junk.c
|
echo #else >>junk.c
|
||||||
echo #ifdef __GO32__ >>junk.c
|
echo #ifdef __GO32__ >>junk.c
|
||||||
echo {return 10;} >>junk.c
|
echo {return 10;} >>junk.c
|
||||||
echo #else >>junk.c
|
echo #else >>junk.c
|
||||||
echo {return 0;} >>junk.c
|
echo {return 0;} >>junk.c
|
||||||
echo #endif >>junk.c
|
echo #endif >>junk.c
|
||||||
@ -123,21 +123,21 @@ junk
|
|||||||
If ErrorLevel 10 Goto go32Ok
|
If ErrorLevel 10 Goto go32Ok
|
||||||
rm -f junk.c junk junk.exe
|
rm -f junk.c junk junk.exe
|
||||||
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
|
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!
|
||||||
Goto End
|
Goto End
|
||||||
:go32Ok
|
:go32Ok
|
||||||
set djgpp_ver=2
|
set djgpp_ver=2
|
||||||
If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!
|
If Not ErrorLevel 22 Echo To build 'Emacs' you need DJGPP v2.02 or later!
|
||||||
If Not ErrorLevel 22 Goto End
|
If Not ErrorLevel 22 Goto End
|
||||||
rm -f junk.c junk junk.exe
|
rm -f junk.c junk junk.exe
|
||||||
rem DJECHO is used by the top-level Makefile in the v2.x build
|
rem DJECHO is used by the top-level Makefile in the v2.x build
|
||||||
Echo Checking whether 'djecho' is available...
|
Echo Checking whether 'djecho' is available...
|
||||||
redir -o Nul -eo djecho -o junk.$$$ foo
|
redir -o Nul -eo djecho -o junk.$$$ foo
|
||||||
If Exist junk.$$$ Goto djechoOk
|
If Exist junk.$$$ Goto djechoOk
|
||||||
Echo To build 'Emacs' you need the 'djecho.exe' program!
|
Echo To build 'Emacs' you need the 'djecho.exe' program!
|
||||||
Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.
|
Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.
|
||||||
Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,
|
Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,
|
||||||
Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.
|
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.
|
Echo Then run CONFIG.BAT again with the same arguments you did now.
|
||||||
Goto End
|
Goto End
|
||||||
:djechoOk
|
:djechoOk
|
||||||
rm -f junk.$$$
|
rm -f junk.$$$
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2014-08-09 Eli Zaretskii <eliz@gnu.org>
|
||||||
|
|
||||||
|
* INSTALL: Fix last change.
|
||||||
|
|
||||||
2014-08-09 Reuben Thomas <rrt@sc3d.org>
|
2014-08-09 Reuben Thomas <rrt@sc3d.org>
|
||||||
|
|
||||||
* sed2v2.inp: Remove support for DJGPP 2.01.
|
* sed2v2.inp: Remove support for DJGPP 2.01.
|
||||||
|
@ -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
|
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
|
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
|
for more information about locations and versions. The Emacs FAQ (see
|
||||||
info/efaq.info) includes pointers to Internet sites where you can find
|
info/efaq.info) includes pointers to Internet sites where you can find
|
||||||
the necessary utilities; search for "MS-DOS". The configuration step
|
the necessary utilities; search for "MS-DOS". The configuration step
|
||||||
|
Loading…
Reference in New Issue
Block a user