From: Glenn Morris <rgm@gnu.org>
Date: Thu, 13 May 2010 03:55:46 +0000 (-0700)
Subject: Some msdos build fixes (hopefully, possibly, ...)
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2^2~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99ab9eb4cbf2e9cdab7b8294b459a2b888c99d62;p=emacs.git

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 e98fd2164ec..50b2e643eb8 100644
--- 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 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!