Build simplifications for oldxmenu.

* configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.
(OLDXMENU_TARGET): Set to empty if USE_GTK.

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

* msdos/sed1x.inp (OLDXMENU): Replace any initial value.
* msdos/sed1v2.inp (OLDXMENU): Edit to "nothing".

3 files changed, 5 insertions, 2 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 3afea1696e7..df532f60c9a 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
+        * sed1x.inp (OLDXMENU): Replace any initial value.
+        * sed1v2.inp (OLDXMENU): Edit to "nothing".
+
         * sed1v2.inp (CANNOT_DUMP): Edit to no.
 
 2010-05-20  Glenn Morris  <rgm@gnu.org>
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index ba6846b9648..a54e40b5c05 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -114,7 +114,7 @@ s/\.h\.in/.h-in/
 /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@//
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
-/^OLDXMENU *=/s/@OLDXMENU@//
+/^OLDXMENU *=/s/@OLDXMENU@/nothing/
 /^LIBXMENU *=/s/@LIBXMENU@//
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 118b00c2538..aa755ee784f 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -19,7 +19,7 @@
 s!^     cd \${oldXMenudir}; \${MAKE}.*$!        ${MAKE} -C ${oldXMenudir}.!
 s!^     @true *$!       @rem!
 s/DOC/DOC-X/g
-/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
+/^OLDXMENU *=/s!=.*!= ${oldXMenudir}libXMenu11.a!
 /^LIBXMENU *=/s!= *!= ${OLDXMENU}!
 /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!