Adapt the MSDOS build to introduction of sha1 and other latest changes.

 msdos/sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
 src/.  Make editing of RUN_TEMACS commands less sensitive to
 leading whitespace.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add sha1.o.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 17b3c92d4544c3b9e6fcf6d8051797d4cd2fee80..d4aa2344baa08b91109dc92fbd6925e6a051bbf9 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
+       src/.  Make editing of RUN_TEMACS commands less sensitive to
+       leading whitespace.
+
+       * sedlibmk.inp (gl_LIBOBJS): Add sha1.o.
+
 2011-05-20  Eli Zaretskii  <eliz@gnu.org>
 
        * sed1v2.inp (make-docfile commands): Recognize only if the line

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index da3c1386760ae8058dc4b9e1a895b1b95863afea..623f5cacbc96baac7a89f905e6b689c3168839bc 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -130,13 +130,13 @@ s/\.h\.in/.h-in/
 /^     [       ]*\$(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)!
+/^     [       ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src!
 /^[\f   ]*$/d
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
 /^     if test "\$(CANNOT_DUMP)" =/,/^ else /d
 /^     fi/d
-/^     LC_ALL=C \$(RUN_TEMACS)/i\
+/^      *LC_ALL=C \$(RUN_TEMACS)/i\
        stubedit temacs.exe minstack=1024k
 /^      *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/
 /-batch -l loadup/a\

diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 7bc773cf931d65315168335473be44e88e629578..eafdacaa3cae06cc320ac647aec9e65e3d66cd2d 100644 (file)
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -521,7 +521,7 @@ am__cd = cd
 /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
 /am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/
 /am__append_2 *=.*verify\.h/s/@[^@\n]*@//
-/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/
+/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o sha1.o/
 /^BUILT_SOURCES *=/s/ *inttypes\.h//
 /^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
 /^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//