From: Glenn Morris <rgm@gnu.org>
Date: Sat, 2 Nov 2013 19:23:45 +0000 (-0700)
Subject: * src/Makefile.in (lispdir): Remove.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1022
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=739f57cd1f17b92760c2631c7eec003e3a756415;p=emacs.git

* src/Makefile.in (lispdir): Remove.
(TAGS-LISP): Replace lispdir with its expansion.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 99d19cd68c7..d0193f355a2 100644
--- 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 c61ff2ddd46..e3f4fb60a40 100644
--- 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)"