aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorGlenn Morris2010-05-10 19:51:08 -0700
committerGlenn Morris2010-05-10 19:51:08 -0700
commitacddf8aec716be7810edc29e1a7eeb396fc755c3 (patch)
treea117eb6eaa9dc16ec1e74ff4844f3e1e7944899c /msdos
parent4e2af7825fa13782c5579f55b3e2d8dec23bdbf3 (diff)
downloademacs-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 'msdos')
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sed1x.inp1
-rw-r--r--msdos/sed3x.inp5
3 files changed, 11 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6922c6f55db..bed87472907 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
12010-05-11 Glenn Morris <rgm@gnu.org>
2
3 * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
4 * sed3x.inp: New file.
5
12010-05-10 Glenn Morris <rgm@gnu.org> 62010-05-10 Glenn Morris <rgm@gnu.org>
2 7
3 * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty. 8 * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 2a7ce82d528..8be94aafa03 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -5,6 +5,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.!
5s!^ @true *$! @rem! 5s!^ @true *$! @rem!
6s/DOC/DOC-X/g 6s/DOC/DOC-X/g
7#/^LIBXMENU *=/s!= *!= ../oldxmenu/! 7#/^LIBXMENU *=/s!= *!= ../oldxmenu/!
8/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
8/^temacs *:/s!OLDXMENU!LIBXMENU! 9/^temacs *:/s!OLDXMENU!LIBXMENU!
9 10
10# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19 11# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
diff --git a/msdos/sed3x.inp b/msdos/sed3x.inp
new file mode 100644
index 00000000000..71148c9800d
--- /dev/null
+++ b/msdos/sed3x.inp
@@ -0,0 +1,5 @@
1# -sed3x.inp------------------------------------------------------------
2# Extra configuration script for lib-src/makefile for DesqView/X
3# ----------------------------------------------------------------------
4/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
5