Mercurial > emacs
changeset 108525:25f3a5a76921
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}.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 12 May 2010 20:55:46 -0700 |
| parents | 732a4fb5612e |
| children | f3d57f9fdf9f 4ab372e65d32 |
| files | msdos/ChangeLog msdos/sed1x.inp |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Wed May 12 20:52:07 2010 -0700 +++ b/msdos/ChangeLog Wed May 12 20:55:46 2010 -0700 @@ -1,5 +1,9 @@ 2010-05-13 Glenn Morris <rgm@gnu.org> + * 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)
--- a/msdos/sed1x.inp Wed May 12 20:52:07 2010 -0700 +++ b/msdos/sed1x.inp Wed May 12 20:55:46 2010 -0700 @@ -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!