Fix version string in top-level MSDOS Makefile.

 msods/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.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7df89880410a8fa4b723453f38c5eccef30540e0..7227b8b8b51bf8a6681376e259bf0c2d5077f665 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * mainmake.v2 (version): Update due to change in emacs.c.
+
 2010-08-05  Eli Zaretskii  <eliz@gnu.org>
 
        * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 4bb13e367ede191e3d99648975c459ce29ba5f1c..79bd827d8c6e1752d36bf9a235448147b6d73e32 100644 (file)
--- 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 '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
+version := ${shell sed -n -e '/^static 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 

diff --git a/src/ChangeLog b/src/ChangeLog
index 024cf18efb629b170d84aecbf6276cf25a5678b2..24754355fdc50e077d9ca445ab2a88c51ec6b0b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs.c <emacs_version>: Add a comment regarding
+       msdos/mainmake.v2's dependency on the syntax of this declaration.
+
 2010-08-13  Eli Zaretskii  <eliz@gnu.org>
 
        * unexcoff.c: Remove the parts used when "emacs" is not defined.

diff --git a/src/emacs.c b/src/emacs.c
index 026a210af50d51f23773d14fe6e7dd0a42119492..67a99d674e720f3c59e561833fcb2505afe6cdc9 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -91,6 +91,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
 
+/* If you change the following line, remember to update
+   msdos/mainmake.v2 which gleans the Emacs version from it!  */
 static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
 static const char emacs_version[] = "24.0.50";