diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-05-28 13:00:09 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-05-28 13:00:09 +0300 |
| commit | d451b0879113e2dca94a5ffaf1e4bb9b31a260b6 (patch) | |
| tree | 3c64372c98ddbc5e8608a6bfcda7f537444151a0 /msdos | |
| parent | 0ff8e1ba6b4819aca0c95e15e2255908e3d276d3 (diff) | |
| download | emacs-d451b0879113e2dca94a5ffaf1e4bb9b31a260b6.tar.gz | |
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.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 8 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 17b3c92d454..d4aa2344baa 100644 --- 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 da3c1386760..623f5cacbc9 100644 --- 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! /^[ ]*$/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 7bc773cf931..eafdacaa3ca 100644 --- 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)// |