diff options
| author | Eli Zaretskii <[email protected]> | 2009-02-28 14:01:41 +0000 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2009-02-28 14:01:41 +0000 |
| commit | 291f6a31ae92386febe9d78413b37fdf7ccb32f6 (patch) | |
| tree | cc5ad4b3129ef16a242dd7524c7be88930ca9b01 | |
| parent | 237aabf40e931afa2f512efa2a80e4be5c3d2b2a (diff) | |
(boot): Don't require b-emacs.exe if not building out of CVS.
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7088f4bc7d..868fb39596 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2009-02-28 Eli Zaretskii <[email protected]> + + * mainmake.v2 (boot): Don't require b-emacs.exe if not building + out of CVS. + 2008-12-19 Eli Zaretskii <[email protected]> * INSTALL: Document the problems on Windows Vista and the diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 55bb2087f2..c77c41a2ba 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -67,11 +67,17 @@ top_srcdir := $(subst \,/,$(shell cd)) # Find out which version of Emacs this is. version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el} -# Do we need to bootstrap? +# Q: Do we need to bootstrap? +# A: Only if we find admin/admin.el, i.e. we are building out of CVS, +# and src/b-emacs.exe does not exist. This avoids building a +# bootstrap-emacs and recompiling Lisp files when building a +# pretest/release tarball. boot := +ifneq ($(wildcard admin/admin.el),) ifeq ($(wildcard src/b-emacs.exe),) boot := b-emacs.exe endif +endif # Subdirectories to run Make. `lisp' is not included because the # compiled lisp files are part of the distribution. (If we are |