1 files changed, 10 insertions, 4 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 218e053689e..613d5ae80a2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -860,8 +860,14 @@ unlock:
 relock:
         chmod -w $(SOURCES)
         chmod +w paths.h
-tagsfiles = [a-zA-Z]*.h [a-zA-Z]*.c ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el
-TAGS: $(tagsfiles)
-        etags $(tagsfiles)
-tags: TAGS
+
+# Arrange to make a tags table in ../lisp, and another in this dir
+# which includes ../lisp/TAGS by reference.
+ctagsfiles = [a-zA-Z]*.h [a-zA-Z]*.c
+lisptagsfiles = ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el
+TAGS: $(ctagsfiles)
+        ../lib-src/etags --include=../lisp/TAGS $(ctagsfiles)
+../lisp/TAGS: $(lisptagsfiles)
+        cd ../lisp; $(MAKE) TAGS
+tags: TAGS ../lisp/TAGS
 .PHONY: tags