diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-21 09:26:55 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-21 09:26:55 -0800 |
| commit | 4e8b693819c766e3c5c66096f500802559d9e124 (patch) | |
| tree | 07587b77ef5e8b28786c311f16a8c073303ede64 /src/Makefile.in | |
| parent | 06e752b48f12b914c55bbb51842dbed45080e0bd (diff) | |
| download | emacs-4e8b693819c766e3c5c66096f500802559d9e124.tar.gz | |
Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.
This simplifies the previous change to configure.ac and src/Makefile.in.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 2 insertions, 6 deletions
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. |