# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1273960882 25200
# Node ID 4cbe9b411630734918fda9180d89b0143dcfc90d
# Parent  cd68e3a31ac49627d55910ef4228dee6368955fd
Always define OLDXMENU in src/Makefile.in.

* src/Makefile.in (OLDXMENU): Always define.

* msdos/sed1v2.inp (OLDXMENU): Edit to empty.
* msdos/sed1x.inp (OLDXMENU): Expect empty initial value.

diff -r cd68e3a31ac4 -r 4cbe9b411630 msdos/ChangeLog
--- a/msdos/ChangeLog	Sat May 15 14:51:12 2010 -0700
+++ b/msdos/ChangeLog	Sat May 15 15:01:22 2010 -0700
@@ -1,5 +1,8 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
+	* sed1v2.inp (OLDXMENU): Edit to empty.
+	* sed1x.inp (OLDXMENU): Expect empty initial value.
+
 	* sed1v2.inp (LIBX_OTHER): Edit to empty.
 	* sed1x.inp (LIBX_OTHER): Expect empty initial value.
 
diff -r cd68e3a31ac4 -r 4cbe9b411630 msdos/sed1v2.inp
--- a/msdos/sed1v2.inp	Sat May 15 14:51:12 2010 -0700
+++ b/msdos/sed1v2.inp	Sat May 15 15:01:22 2010 -0700
@@ -112,6 +112,7 @@
 /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@//
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
+/^OLDXMENU *=/s/@OLDXMENU@//
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
diff -r cd68e3a31ac4 -r 4cbe9b411630 msdos/sed1x.inp
--- a/msdos/sed1x.inp	Sat May 15 14:51:12 2010 -0700
+++ b/msdos/sed1x.inp	Sat May 15 15:01:22 2010 -0700
@@ -4,7 +4,7 @@
 s!^	cd \${oldXMenudir}; \${MAKE}.*$!	${MAKE} -C ${oldXMenudir}.!
 s!^	@true *$!	@rem!
 s/DOC/DOC-X/g
-/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a!
+/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
 /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
 /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
diff -r cd68e3a31ac4 -r 4cbe9b411630 src/ChangeLog
--- a/src/ChangeLog	Sat May 15 14:51:12 2010 -0700
+++ b/src/ChangeLog	Sat May 15 15:01:22 2010 -0700
@@ -1,6 +1,6 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
-	* Makefile.in (LIBX_OTHER): Always define.
+	* Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
 
 	* Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
 	(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
diff -r cd68e3a31ac4 -r 4cbe9b411630 src/Makefile.in
--- a/src/Makefile.in	Sat May 15 14:51:12 2010 -0700
+++ b/src/Makefile.in	Sat May 15 15:01:22 2010 -0700
@@ -294,8 +294,12 @@
 #endif
 	$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
+/* If !HAVE_X11 || USE_GTK, empty.
+   Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
+   Else ${oldXMenudir}libXMenu11.a.  */
+OLDXMENU=@OLDXMENU@
+
 #ifdef HAVE_X_WINDOWS
-OLDXMENU=@OLDXMENU@
 LIBXMENU=@LIBXMENU@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)