diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-10 19:51:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-10 19:51:08 -0700 |
| commit | acddf8aec716be7810edc29e1a7eeb396fc755c3 (patch) | |
| tree | a117eb6eaa9dc16ec1e74ff4844f3e1e7944899c /lib-src | |
| parent | 4e2af7825fa13782c5579f55b3e2d8dec23bdbf3 (diff) | |
| download | emacs-acddf8aec716be7810edc29e1a7eeb396fc755c3.tar.gz | |
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 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 608d5c618b3..6f3879fb266 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-05-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + (config.h) [MSDOS]: Do not include. + 2010-05-10 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5f0fb6e671f..683a97393db 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -167,11 +167,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -#ifdef MSDOS -#include "../src/config.h" -LIBS_SYSTEM = MSDOS_LIBS_SYSTEM -#endif - LOADLIBES=$(LIBS_SYSTEM) |