diff options
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
5 files changed, 11 insertions, 3 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index ecc615b96b3..85c9f594311 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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 --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 899af98ef67..836df145fa5 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -112,6 +112,7 @@ s/\.h\.in/.h-in/ /^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 --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 1eca4e819cb..ecb8828cc23 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -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 --git a/src/ChangeLog b/src/ChangeLog index 75fc5532904..42dbffccf5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/Makefile.in b/src/Makefile.in index cfb057a4085..50411c1b118 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -294,8 +294,12 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) #endif $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< -#ifdef HAVE_X_WINDOWS +/* If !HAVE_X11 || USE_GTK, empty. + Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a. + Else ${oldXMenudir}libXMenu11.a. */ OLDXMENU=@OLDXMENU@ + +#ifdef HAVE_X_WINDOWS LIBXMENU=@LIBXMENU@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) |