diff options
| author | Glenn Morris | 2010-05-10 19:51:08 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-10 19:51:08 -0700 |
| commit | acddf8aec716be7810edc29e1a7eeb396fc755c3 (patch) | |
| tree | a117eb6eaa9dc16ec1e74ff4844f3e1e7944899c /config.bat | |
| parent | 4e2af7825fa13782c5579f55b3e2d8dec23bdbf3 (diff) | |
| download | emacs-acddf8aec716be7810edc29e1a7eeb396fc755c3.tar.gz emacs-acddf8aec716be7810edc29e1a7eeb396fc755c3.zip | |
On msdos, set LIBS_SYSTEM with config.bat, not cpp.
* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
* src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
* src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
* msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
* msdos/sed3x.inp: New file.
* lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
(config.h) [MSDOS]: Do not include.
Diffstat (limited to 'config.bat')
| -rw-r--r-- | config.bat | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.bat b/config.bat index 271673bc302..e2e57bb5ef9 100644 --- a/config.bat +++ b/config.bat | |||
| @@ -231,6 +231,11 @@ Goto libsrc2 | |||
| 231 | sed -f ../msdos/sed3v2.inp <makefile.new >Makefile | 231 | sed -f ../msdos/sed3v2.inp <makefile.new >Makefile |
| 232 | :libsrc2 | 232 | :libsrc2 |
| 233 | rm -f makefile.new junk.c | 233 | rm -f makefile.new junk.c |
| 234 | if "%X11%" == "" goto libsrc2a | ||
| 235 | mv Makefile makefile.tmp | ||
| 236 | sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile | ||
| 237 | rm -f makefile.tmp | ||
| 238 | :libsrc2a | ||
| 234 | if "%nodebug%" == "" goto libsrc3 | 239 | if "%nodebug%" == "" goto libsrc3 |
| 235 | sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp | 240 | sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp |
| 236 | sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile | 241 | sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile |