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}.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e98fd2164eca44d4bbb368c9d88ff5666b5e9435..50b2e643eb825c99b6fc105aa755671c2ee07759 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -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)

diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 8be94aafa0342c6787958822dcf8b57ebb3171a3..db2ce614668f7cbca248c67d59e0b4aaa766ebd3 100644 (file)
--- 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!