Mercurial > emacs
changeset 111012:2b6e7f137773
Fix the MSDOS build broken by last revisions.
msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in revno 101897.
msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in revno 101876.
src/unexcoff.c (make_hdr): Fix prototype according to changes in
revno 101757.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 15 Oct 2010 20:45:12 +0200 |
| parents | f87c1553c94e (current diff) 98fd8b0e411d (diff) |
| children | 5ffdb52c377c |
| files | |
| diffstat | 5 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Fri Oct 15 18:44:01 2010 +0200 +++ b/msdos/ChangeLog Fri Oct 15 20:45:12 2010 +0200 @@ -1,3 +1,11 @@ +2010-10-15 Eli Zaretskii <eliz@gnu.org> + + * sed1v2.inp: Use $(..) instead of ${..} in all edit commands. + Needed because of changes in revno 101897. + + * sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed + because of changes in revno 101876. + 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> * sed1v2.inp (PROFILING_LDFLAGS):
--- a/msdos/sed1v2.inp Fri Oct 15 18:44:01 2010 +0200 +++ b/msdos/sed1v2.inp Fri Oct 15 20:45:12 2010 +0200 @@ -131,12 +131,12 @@ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! -/^.\${libsrc}make-doc/s!>.*$!! +/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! +/^.\$(libsrc)\/make-doc/s!>.*$!! /^[ ]*$/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ if test "\${CANNOT_DUMP}" =/,/^ else /d +/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d /^ fi/d /^ LC_ALL=C \$(RUN_TEMACS)/i\ stubedit temacs.exe minstack=1024k @@ -152,7 +152,7 @@ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit /^ #/d -/^ cd.*make-docfile/s!$!; cd ${dot}${dot}/src! +/^ cd.*make-docfile/s!$!; cd ../src! /^ @: /d /^ -\{0,1\} *ln -/s/ln -f/cp -pf/ /^[ ]touch /s/touch/djecho $@ >/
--- a/msdos/sed6.inp Fri Oct 15 18:44:01 2010 +0200 +++ b/msdos/sed6.inp Fri Oct 15 20:45:12 2010 +0200 @@ -43,4 +43,6 @@ s/^ for file in $(INFO_TARGETS)\; do rm -f.*$/ rm -f $(INFO_TARGETS)/ } +/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs mkdir ..\\..\\info| + # arch-tag: defe1001-f35a-47f7-9635-3f5d33ee5e97
--- a/src/ChangeLog Fri Oct 15 18:44:01 2010 +0200 +++ b/src/ChangeLog Fri Oct 15 20:45:12 2010 +0200 @@ -1,5 +1,8 @@ 2010-10-15 Eli Zaretskii <eliz@gnu.org> + * unexcoff.c (make_hdr): Fix prototype according to changes in + revno 101757. + * image.c (tiff_load): Cast 3rd argument to avoid compiler warning. 2010-10-15 Tassilo Horn <tassilo@member.fsf.org>
--- a/src/unexcoff.c Fri Oct 15 18:44:01 2010 +0200 +++ b/src/unexcoff.c Fri Oct 15 20:45:12 2010 +0200 @@ -141,8 +141,7 @@ error (msg, a1, a2); } -static int make_hdr (int, int, unsigned, unsigned, unsigned, - const char *, const char *); +static int make_hdr (int, int, const char *, const char *); static int copy_text_and_data (int, int); static int copy_sym (int, int, const char *, const char *); static void mark_x (const char *);