comparison msdos/mainmake.v2 @ 102328:51e686047b3b

(boot): Don't require b-emacs.exe if not building out of CVS.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 28 Feb 2009 14:01:12 +0000
parents dc97fcf1ed7e
children 4d83e5b1225b
comparison
equal deleted inserted replaced
102327:a1f0d8fadbb1 102328:51e686047b3b
65 top_srcdir := $(subst \,/,$(shell cd)) 65 top_srcdir := $(subst \,/,$(shell cd))
66 66
67 # Find out which version of Emacs this is. 67 # Find out which version of Emacs this is.
68 version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el} 68 version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el}
69 69
70 # Do we need to bootstrap? 70 # Q: Do we need to bootstrap?
71 # A: Only if we find admin/admin.el, i.e. we are building out of CVS,
72 # and src/b-emacs.exe does not exist. This avoids building a
73 # bootstrap-emacs and recompiling Lisp files when building a
74 # pretest/release tarball.
71 boot := 75 boot :=
76 ifneq ($(wildcard admin/admin.el),)
72 ifeq ($(wildcard src/b-emacs.exe),) 77 ifeq ($(wildcard src/b-emacs.exe),)
73 boot := b-emacs.exe 78 boot := b-emacs.exe
79 endif
74 endif 80 endif
75 81
76 # Subdirectories to run Make. `lisp' is not included because the 82 # Subdirectories to run Make. `lisp' is not included because the
77 # compiled lisp files are part of the distribution. (If we are 83 # compiled lisp files are part of the distribution. (If we are
78 # bootstrapping, the src target will run Make in `lisp' as well.) 84 # bootstrapping, the src target will run Make in `lisp' as well.)