Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.

This simplifies the previous change to configure.ac and src/Makefile.in.

2 files changed, 2 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a8ac2190a3..769b4ca6e64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,8 +6,6 @@
         * Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
         (really-lwlib, really-oldXMenu, stamp-oldxmenu)
         (../src/$(OLDXMENU), $(OLDXMENU)): Remove.
-        (LIBXMENU_DIR, LIBXMENU_BASE): New macros.
-        (LIBXMENU): Use them.
         (temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
         ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
         (boostrap-clean): No need to remove stamp-oldxmenu.
diff --git a/src/Makefile.in b/src/Makefile.in
index c110f3158d9..dd641e0eb19 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -181,11 +181,7 @@ LIBXT_OTHER=@LIBXT_OTHER@
 ## If !HAVE_X11 || USE_GTK, empty.
 ## Else if USE_X_TOOLKIT, $(lwlibdir)/liblw.a.
 ## Else $(oldXMenudir)/libXMenu11.a.
-## LIBXMENU_DIR is the directory part, including any slash;
-## LIBXMENU_BASE is the rest.
-LIBXMENU_DIR=@LIBXMENU_DIR@
-LIBXMENU_BASE=@LIBXMENU_BASE@
-LIBXMENU=$(LIBXMENU_DIR)$(LIBXMENU_BASE)
+LIBXMENU=@LIBXMENU@
 
 ## xmenu.o if HAVE_X_WINDOWS, else empty.
 XMENU_OBJ=@XMENU_OBJ@
@@ -204,7 +200,7 @@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
 LIBX_OTHER=@LIBX_OTHER@
 
-## LIBXMENU is nil if !HAVE_X_WINDOWS.
+## LIBXMENU is empty if !HAVE_X_WINDOWS.
 ## LD_SWITCH_X_SITE should not be used if not using X, but nothing
 ## sets it at present, and if something ever does, it should be
 ## configure, which should set it to nil in non-X builds.