Improve TAGS target on MS-DOS.

 msdos/mainmake.v2 (TAGS tags): Use `find' to filter out loaddefs
 files.  Make all file names in TAGS tables absolute.

2 files changed, 14 insertions, 4 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index b52d49b4923..844f8af4efd 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * mainmake.v2 (TAGS tags): Use `find' to filter out loaddefs
+        files.  Make all file names in TAGS tables absolute.
+
 2010-10-01  Eli Zaretskii  <eliz@gnu.org>
 
         * sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty.
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 79bd827d8c6..15476c1468a 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -147,16 +147,21 @@ FRC:
 
 # We cannot use [a-zA-Z]* like the mainline distribution does, because
 # that causes all file names to be returned in upper-case on DOS...
+# Must use `find' to filter out loaddefs files; ignore errors if `find'
+# is not available or is an MS `find'.
+# The "cd $(CURDIR)" gork is for when `find' fails and leaves us inside
+# `lisp' or one of its subdirectories.
 TAGS tags:      lib-src FRC
         cd lib-src
         if exist etags.exe mv -f etags.exe ../bin
         cd ..
-        cd lisp
-        ../bin/etags .../*.el
-        cd ..
+        - find $(CURDIR)/lisp -iname "*.el" -a -! -( -iname "*loaddefs.el" -o -iname "ldefs-boot.el" -) | ./bin/etags -o lisp/TAGS -
+        cd $(CURDIR)
         cd src
         ../bin/etags --include=../lisp/TAGS \
-        '--regex=/[     ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' *.c *.h s/msdos.h m/intel386.h
+         --regex='/[    ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
+         $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
+         $(CURDIR)/src/s/msdos.h $(CURDIR)/src/m/intel386.h
         cd ..
         ./bin/etags --include=src/TAGS