From 99ab9eb4cbf2e9cdab7b8294b459a2b888c99d62 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 12 May 2010 20:55:46 -0700 Subject: [PATCH] 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}. --- msdos/ChangeLog | 4 ++++ msdos/sed1x.inp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/msdos/ChangeLog b/msdos/ChangeLog index e98fd2164ec..50b2e643eb8 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,9 @@ 2010-05-13 Glenn Morris + * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. + (LIBXMENU): Edit to ${OLDXMENU}. + (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}. + * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) (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 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! s!^ @true *$! @rem! s/DOC/DOC-X/g -#/^LIBXMENU *=/s!= *!= ../oldxmenu/! +/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! +/^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! +/^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^temacs *:/s!OLDXMENU!LIBXMENU! -- 2.39.2