Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05-20T00:41:03Z!rgm@gnu.org.

 config.bat: Concatenate lisp.mk onto the end of src/Makefile.
 msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
 begins with a TAB.  Use $(etc) rather than a literal "../etc".
 (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
 (@lisp_frag@): Edit out.
 msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
 zero.
 src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
 report_file_error introduced by the change from 2011-05-07.

3 files changed, 16 insertions, 2 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6c07c76d1bf..17b3c92d454 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * sed1v2.inp (make-docfile commands): Recognize only if the line
+        begins with a TAB.  Use $(etc) rather than a literal "../etc".
+        (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
+        (@lisp_frag@): Edit out.
+
+        * sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
+        zero.
+
 2011-05-19  Glenn Morris  <rgm@gnu.org>
 
         * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 34c4588f96a..da3c1386760 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -127,9 +127,10 @@ s/\.h\.in/.h-in/
 /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
 /^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
-/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o ../etc/DOC!
-/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
+/^      [       ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
+/^      [       ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
 /^.\$(libsrc)\/make-doc/s!>.*$!!
+/^      [       ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)!
 /^[    ]*$/d
 /^      if test -f/,/^  fi$/c\
         command.com /c if exist .gdbinit rm -f _gdbinit
@@ -161,6 +162,7 @@ s/^	[^ 	]*move-if-change /	update /
 /^      -\{0,1\} *ln -/s/ln -f/cp -pf/
 /^[     ]touch /s/touch/djecho $@ >/
 s/@YMF_PASS_LDFLAGS@/flags/
+s/@lisp_frag@//
 s/@deps_frag@//
 s/@ns_frag@//
 s/@PRE_EDIT_LDFLAGS@//
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 0c501421821..7bc773cf931 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -197,6 +197,7 @@ am__cd = cd
 /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
 /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
 /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/
+/^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/
 /^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/
 /^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/
 /^GNULIB_LINK *=/s/@GNULIB_LINK@/0/
@@ -328,6 +329,7 @@ am__cd = cd
 /^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/
 /^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
 /^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/
+/^HAVE_GROUP_MEMBER *=/s/@HAVE_GROUP_MEMBER@/0/
 /^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/
 /^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/
 /^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/