aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-12 20:55:46 -0700
committerGlenn Morris2010-05-12 20:55:46 -0700
commit99ab9eb4cbf2e9cdab7b8294b459a2b888c99d62 (patch)
tree02cfc80b0da2374fefa7311c64da144c6b3cb085
parent472c5d6b4488f3214992db8126e6238255b65a40 (diff)
downloademacs-99ab9eb4cbf2e9cdab7b8294b459a2b888c99d62.tar.gz
emacs-99ab9eb4cbf2e9cdab7b8294b459a2b888c99d62.zip
Some msdos build fixes (hopefully, possibly, ...)
* msdos/sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. (LIBXMENU): Edit to ${OLDXMENU}. (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
-rw-r--r--msdos/ChangeLog4
-rw-r--r--msdos/sed1x.inp4
2 files changed, 7 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e98fd2164ec..50b2e643eb8 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,9 @@
12010-05-13 Glenn Morris <rgm@gnu.org> 12010-05-13 Glenn Morris <rgm@gnu.org>
2 2
3 * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
4 (LIBXMENU): Edit to ${OLDXMENU}.
5 (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
6
3 * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) 7 * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
4 (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) 8 (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
5 (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) 9 (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 8be94aafa03..db2ce614668 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -4,7 +4,9 @@
4s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! 4s!^ 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/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a!
8/^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
9/^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}!
8/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! 10/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
9/^temacs *:/s!OLDXMENU!LIBXMENU! 11/^temacs *:/s!OLDXMENU!LIBXMENU!
10 12