diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-06-26 17:36:27 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-06-26 17:36:27 +0300 |
| commit | 394f238630dc4904435c15dad92727a900916b97 (patch) | |
| tree | 660cb2890faea0ce83c4cfcced3a4c8b7773d27c /msdos/mainmake.v2 | |
| parent | 0b7889fc3322ea2a294aab4257544df06d87ad65 (diff) | |
| download | emacs-394f238630dc4904435c15dad92727a900916b97.tar.gz | |
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 2010-05-15T21:11:37Z!raeburn@raeburn.org).
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.
Diffstat (limited to 'msdos/mainmake.v2')
| -rw-r--r-- | msdos/mainmake.v2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 271db707e37..4bb13e367ed 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -65,7 +65,7 @@ MAKESHELL=/xyzzy/command 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 |