Mercurial > emacs
diff msdos/mainmake.v2 @ 109056:ca8db3772b39
Fix the MS-DOS build due to changes in configury.
config.bat: Remove white space around "+" in COPY commands.
msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
instead of lisp/version.el (see revno 100306).
msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
Delete lines in rules that invoke $(MKDEPDIR).
Fix editing rules that begin with "cd ../lisp".
Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 26 Jun 2010 17:36:27 +0300 |
parents | d0ebe5586d94 |
children | 297362357192 |
line wrap: on
line diff
--- a/msdos/mainmake.v2 Sat Jun 26 15:21:24 2010 +0300 +++ b/msdos/mainmake.v2 Sat Jun 26 17:36:27 2010 +0300 @@ -65,7 +65,7 @@ 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} +version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} # Q: Do we need to bootstrap? # A: Only if we find admin/admin.el, i.e. we are building out of