diff options
| author | Eli Zaretskii | 2008-11-15 20:29:14 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-11-15 20:29:14 +0000 |
| commit | aae2a498d70c5fa15ed8390ffc98ddcb1e2d0e49 (patch) | |
| tree | ec2a71a37e62c6bedebe76a2da9a4b41c6b63225 /msdos | |
| parent | ad98e89f4f6d95aad53e900705e7dca894615bca (diff) | |
| download | emacs-aae2a498d70c5fa15ed8390ffc98ddcb1e2d0e49.tar.gz emacs-aae2a498d70c5fa15ed8390ffc98ddcb1e2d0e49.zip | |
(src): Move removal of src/bootlisp after recursing into `lisp'.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 795088dca19..f29d68affbe 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-11-15 Eli Zaretskii <eliz@gnu.org> | 1 | 2008-11-15 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * mainmake.v2 (src): Move removal of src/bootlisp after recursing | ||
| 4 | into `lisp'. | ||
| 5 | |||
| 3 | Make bootstrap work again: | 6 | Make bootstrap work again: |
| 4 | 7 | ||
| 5 | * mainmake.v2 (boot): New variable. | 8 | * mainmake.v2 (boot): New variable. |
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index ba9c81ef26a..074d20902e7 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 | |||
| @@ -95,7 +95,6 @@ lib-src: FRC | |||
| 95 | # is not wrong, but is overkill in 99.99% of the cases. | 95 | # is not wrong, but is overkill in 99.99% of the cases. |
| 96 | src: FRC | 96 | src: FRC |
| 97 | cd src | 97 | cd src |
| 98 | rm -f bootlisp | ||
| 99 | $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" | 98 | $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" |
| 100 | djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \ | 99 | djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \ |
| 101 | '/environment *TERM/s/^.*/set environment TERM internal/' \ | 100 | '/environment *TERM/s/^.*/set environment TERM internal/' \ |
| @@ -109,6 +108,7 @@ src: FRC | |||
| 109 | rm -f gdb.tmp gdb.sed | 108 | rm -f gdb.tmp gdb.sed |
| 110 | cd .. | 109 | cd .. |
| 111 | if exist src\bootlisp redir $(MAKE) -C lisp top_srcdir=${top_srcdir} | 110 | if exist src\bootlisp redir $(MAKE) -C lisp top_srcdir=${top_srcdir} |
| 111 | rm -f src/bootlisp | ||
| 112 | if exist leim\Makefile redir $(MAKE) -C leim top_srcdir=${top_srcdir} | 112 | if exist leim\Makefile redir $(MAKE) -C leim top_srcdir=${top_srcdir} |
| 113 | 113 | ||
| 114 | info: emacs lispref lispintro | 114 | info: emacs lispref lispintro |