Merge from trunk

4 files changed, 34 insertions, 12 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 49d49fb2487..e0b3a965402 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * sed1v2.inp (PROFILING_LDFLAGS):
+        * sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * mainmake.v2 (install): Remove b2m.
+
+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.
+
 2010-09-22  Eli Zaretskii  <eliz@gnu.org>
 
         * sed1v2.inp (LINKER): Don't edit, variable was removed from
@@ -78,10 +96,10 @@
         instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
 
         * sed1v2.inp (MKDEPDIR): Edit to empty.
-        Delete lines in rules that invoke $(MKDEPDIR).
-        Fix editing rules that begin with "cd ../lisp".
-        Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
-        Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
+        Delete lines in rules that invoke $(MKDEPDIR).  Fix editing rules
+        that begin with "cd ../lisp".  Edit out sh if-then-else-fi
+        constructs that test ${CANNOT_DUMP}.  Edit out "|| exit ;\"
+        constructs in emacs${EXEEXT} rule.
 
 2010-06-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 79bd827d8c6..8965f746a6d 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -129,7 +129,7 @@ emacs misc lispref lispintro:	FRC
 install: all
         if not exist bin\nul md bin
         cd lib-src
-        command.com /c >/dev/null for %p in (hexl etags ctags b2m ebrowse) do\
+        command.com /c >/dev/null for %p in (hexl etags ctags ebrowse) do\
            if exist %p.exe mv -f %p.exe ../bin
         if exist fns.el update fns.el ../bin/fns.el
         cd ..
@@ -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
 
@@ -282,4 +287,3 @@ bootstrap: bootstrap-clean FRC
         command.com /e:2048 /c config msdos
         $(MAKE) $(MFLAGS) info all
 
-# arch-tag: 6fee5130-4c53-46c6-93d3-d0ea852298b9
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 58201c155bf..3c1770d1ba1 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -43,7 +43,6 @@ s/\.h\.in/.h-in/
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
 #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
 /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
 /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
@@ -104,6 +103,8 @@ s/\.h\.in/.h-in/
 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
 /^LIBRESOLV *=/s/@LIBRESOLV@//
 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
+/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
+/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
 /^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
 /^START_FILES *=/s/@START_FILES@//
 /^OTHER_FILES *=/s/@OTHER_FILES@//
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 9e2e3ebd23f..4a19d36a581 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -41,7 +41,6 @@
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!