comparison msdos/mainmake.v2 @ 109891:373abedd1f02

merge from upstream
author joakim@verona.se
date Fri, 20 Aug 2010 22:00:00 +0200
parents 297362357192
children 0186f2ee32d8
comparison
equal deleted inserted replaced
109888:fd080c6fcd86 109891:373abedd1f02
63 63
64 # Generate a full pathname of the top-level installation directory 64 # Generate a full pathname of the top-level installation directory
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 '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} 68 version := ${shell sed -n -e '/^static const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
69 69
70 # Q: 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 71 # A: Only if we find admin/admin.el, i.e. we are building out of
72 # a VCS-checkout (not a release) and src/b-emacs.exe does not exist. 72 # a VCS-checkout (not a release) and src/b-emacs.exe does not exist.
73 # This avoids building a bootstrap-emacs and recompiling Lisp files 73 # This avoids building a bootstrap-emacs and recompiling Lisp files