(boot): Don't require b-emacs.exe if not building out of CVS.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7088f4bc7d372f1f8ba2dd99fc6ed8ebe78fba51..868fb39596130cba30a0f9a5c1bb31c6af99f655 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+       * mainmake.v2 (boot): Don't require b-emacs.exe if not building
+       out of CVS.
+
 2008-12-19  Eli Zaretskii  <eliz@gnu.org>
 
        * INSTALL: Document the problems on Windows Vista and the

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 55bb2087f24d2a57a5975f05ae80d354b0249cf4..c77c41a2ba5d0e94d925befa6be219e5dc58e153 100644 (file)
--- 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