aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-20 22:49:20 +0300
committerEli Zaretskii2010-08-20 22:49:20 +0300
commitff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d (patch)
tree50fddf4dc9cc34e4f78357a545fcb3a9677c05d7 /msdos
parentc30b8a12a4a57bfe070dd68b014d7d425bab8ed9 (diff)
parent491a154635caf0bf90fd1c4ad35f02d43eac98ee (diff)
downloademacs-ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d.tar.gz
emacs-ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d.zip
Fix version string in top-level MSDOS Makefile.
msdos/mainmake.v2 (version): Update due to change in emacs.c. src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's dependency on the syntax of this declaration.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/ChangeLog4
-rw-r--r--msdos/mainmake.v22
2 files changed, 5 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7df89880410..7227b8b8b51 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
12010-08-15 Eli Zaretskii <eliz@gnu.org>
2
3 * mainmake.v2 (version): Update due to change in emacs.c.
4
12010-08-05 Eli Zaretskii <eliz@gnu.org> 52010-08-05 Eli Zaretskii <eliz@gnu.org>
2 6
3 * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of 7 * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 4bb13e367ed..79bd827d8c6 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -65,7 +65,7 @@ MAKESHELL=/xyzzy/command
65top_srcdir := $(subst \,/,$(shell cd)) 65top_srcdir := $(subst \,/,$(shell cd))
66 66
67# Find out which version of Emacs this is. 67# Find out which version of Emacs this is.
68version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} 68version := ${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