* src/Makefile.in (lispdir): Remove.

(TAGS-LISP): Replace lispdir with its expansion.

diff --git a/src/ChangeLog b/src/ChangeLog
index 99d19cd68c73ecd5ce5505f3a852596dad1f15b6..d0193f355a270e833fec2ae4f4fcd590870ca34f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,14 @@
 2013-11-02  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (abs_srcdir): New, set by configure.
+       (lispdir): Remove.
        (maintainer-clean): Remove pointless echo.  That should be in the
        top-level Makefile, if anywhere.  Delete TAGS-LISP.
        (extraclean): No s/ and m/ directories for some time.
-       (TAGS): Remove no-longer-defined S_FILE.
+       (TAGS): Also depend on ctagsfiles3.
+       Remove no-longer-defined S_FILE.
        Pass absolute filenames to etags once more.
+       (TAGS-LISP): Replace lispdir with its expansion.
        (TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
        ($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.
 

diff --git a/src/Makefile.in b/src/Makefile.in
index c61ff2ddd46d1eccce7c33e8d2c899038ed360a8..e3f4fb60a403c254dace91b7b1c9bfa8bf609611 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,7 +57,6 @@ etc = ../etc
 leimdir = ../leim
 oldXMenudir = ../oldXMenu
 lwlibdir = ../lwlib
-lispdir = ../lisp
 
 # Configuration files for .o files to depend on.
 config_h = config.h $(srcdir)/conf_post.h
@@ -615,7 +614,7 @@ TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(srcdir)/$(ctagsfiles3)
 ## which the above TAGS file for the C files includes by reference.
 frc:
 TAGS-LISP: frc
-       $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS="$(ETAGS)"
+       $(MAKE) -f ../lisp/Makefile TAGS-LISP ETAGS="$(ETAGS)"
 
 $(lwlibdir)/TAGS:
        cd $(lwlibdir) && $(MAKE) TAGS ETAGS="$(ETAGS)"