[Emacs-diffs] /srv/bzr/emacs/trunk r100420: Adapt make-dist to new version location.

[Romain Francoise]

------------------------------------------------------------
revno: 100420
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-24 13:35:41 +0200
message:
  Adapt make-dist to new version location.
  
  * make-dist: Look for version in src/emacs.c.
  Use lisp/subr.el rather than lisp/version.el for location check.
modified:
  ChangeLog
  make-dist

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-21 16:31:45 +0000
+++ b/ChangeLog 2010-05-24 11:35:41 +0000
@@ -1,3 +1,8 @@
+2010-05-24  Romain Francoise  <address@hidden>
+
+       * make-dist: Look for version in src/emacs.c.
+       Use lisp/subr.el rather than lisp/version.el for location check.
+
 2010-05-21  Glenn Morris  <address@hidden>
 
        * configure.in (MKDEPDIR): Parallel build tweak.

=== modified file 'make-dist'
--- a/make-dist 2010-05-20 06:11:27 +0000
+++ b/make-dist 2010-05-24 11:35:41 +0000
@@ -121,8 +121,8 @@
 done
 
 ### Make sure we're running in the right place.
-if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
-  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
+if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
+  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2
   echo "${progname} must be run in the top directory of the Emacs" >&2
   echo "distribution tree.  cd to that directory and try again." >&2
   exit 1
@@ -150,12 +150,12 @@
 fi
 
 ### Find out which version of Emacs this is.
-shortversion=`grep 'defconst[   ]*emacs-version' lisp/version.el \
+shortversion=`grep 'char emacs_version' src/emacs.c \
         | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-version=`grep 'defconst[        ]*emacs-version' lisp/version.el \
+version=`grep 'char emacs_version' src/emacs.c \
         | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if [ ! "${version}" ]; then
-  echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" 
>&2
+  echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
   exit 1
 fi