aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-05-28 13:00:09 +0300
committerEli Zaretskii2011-05-28 13:00:09 +0300
commitd451b0879113e2dca94a5ffaf1e4bb9b31a260b6 (patch)
tree3c64372c98ddbc5e8608a6bfcda7f537444151a0
parent0ff8e1ba6b4819aca0c95e15e2255908e3d276d3 (diff)
downloademacs-d451b0879113e2dca94a5ffaf1e4bb9b31a260b6.tar.gz
emacs-d451b0879113e2dca94a5ffaf1e4bb9b31a260b6.zip
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.
-rw-r--r--msdos/ChangeLog8
-rw-r--r--msdos/sed1v2.inp4
-rw-r--r--msdos/sedlibmk.inp2
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 @@
12011-05-28 Eli Zaretskii <eliz@gnu.org>
2
3 * sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
4 src/. Make editing of RUN_TEMACS commands less sensitive to
5 leading whitespace.
6
7 * sedlibmk.inp (gl_LIBOBJS): Add sha1.o.
8
12011-05-20 Eli Zaretskii <eliz@gnu.org> 92011-05-20 Eli Zaretskii <eliz@gnu.org>
2 10
3 * sed1v2.inp (make-docfile commands): Recognize only if the line 11 * 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/
130/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! 130/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
131/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! 131/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
132/^.\$(libsrc)\/make-doc/s!>.*$!! 132/^.\$(libsrc)\/make-doc/s!>.*$!!
133/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)! 133/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src!
134/^[ ]*$/d 134/^[ ]*$/d
135/^ if test -f/,/^ fi$/c\ 135/^ if test -f/,/^ fi$/c\
136 command.com /c if exist .gdbinit rm -f _gdbinit 136 command.com /c if exist .gdbinit rm -f _gdbinit
137/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d 137/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d
138/^ fi/d 138/^ fi/d
139/^ LC_ALL=C \$(RUN_TEMACS)/i\ 139/^ *LC_ALL=C \$(RUN_TEMACS)/i\
140 stubedit temacs.exe minstack=1024k 140 stubedit temacs.exe minstack=1024k
141/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ 141/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/
142/-batch -l loadup/a\ 142/-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
521/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// 521/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
522/am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/ 522/am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/
523/am__append_2 *=.*verify\.h/s/@[^@\n]*@// 523/am__append_2 *=.*verify\.h/s/@[^@\n]*@//
524/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/ 524/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o sha1.o/
525/^BUILT_SOURCES *=/s/ *inttypes\.h// 525/^BUILT_SOURCES *=/s/ *inttypes\.h//
526/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// 526/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
527/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)// 527/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//