diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-10-15 20:42:54 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-10-15 20:42:54 +0200 |
| commit | c3911ead5daf93b59e29e03b5df47a8aec770b46 (patch) | |
| tree | 36a527c6f317f656949586c97a9b4646cd0a51ee /msdos | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-c3911ead5daf93b59e29e03b5df47a8aec770b46.tar.gz | |
Fix the MSDOS build broken by latest revisions.
src/unexcoff.c (make_hdr): Fix prototype according to changes in
2010-10-03T13:59:56Z!dann@ics.uci.edu.
msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 8 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 8 | ||||
| -rw-r--r-- | msdos/sed6.inp | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index e0b3a965402..4f466436ecc 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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 2010-10-10T14:43:05Z!dann@ics.uci.edu. + + * sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed + because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org. + 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> * sed1v2.inp (PROFILING_LDFLAGS): diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 3c1770d1ba1..19f0d9dc0a9 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -131,12 +131,12 @@ s/\.h\.in/.h-in/ /^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 @@ s/ || true\; \\$// /^ 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 $@ >/ diff --git a/msdos/sed6.inp b/msdos/sed6.inp index f8ad38e4dd9..2382971c30c 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -43,4 +43,6 @@ export texinputdir := $(srcdir)";"$(TEXINPUTS) 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 |