Update scripts and text to refer to version number string in emacs.c

instead of version.el.

4 files changed, 16 insertions, 6 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9ffdcd47d40..54be4a7fec3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-15  Ken Raeburn  <raeburn@raeburn.org>
+
+	* admin.el (set-version, set-copyright): Update emacs.c instead of
+	version.el.
+
+	* make-tarball.txt: Update filename list in step 6.
+
+	* quick-install-emacs: Scan emacs.c instead of version.el for
+	version string.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 23.2 released.
diff --git a/admin/admin.el b/admin/admin.el
index 984f3649b2c..f2cf008f475 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -60,8 +60,8 @@ Root must be the root of an Emacs source tree."
   (interactive "DEmacs root directory: \nsVersion number: ")
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (set-version-in-file root "lisp/version.el" version
-		       (rx (and "emacs-version" (0+ space)
+  (set-version-in-file root "src/emacs.c" version
+		       (rx (and "emacs_version" (0+ (not (in ?\")))
 				?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "README" version
 		       (rx (and "version" (1+ space)
@@ -184,8 +184,8 @@ Root must be the root of an Emacs source tree."
                          (format-time-string "%Y")))))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (set-version-in-file root "lisp/version.el" copyright
-		       (rx (and "emacs-copyright" (0+ space)
+  (set-version-in-file root "src/emacs.c" copyright
+		       (rx (and "emacs_copyright" (0+ (not (in ?\")))
 				?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/ebrowse.c" copyright
                        (rx (and "emacs_copyright" (0+ (not (in ?\")))
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 9979aa03ca6..f685dd5e50f 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -31,7 +31,7 @@ For each step, check for possible errors.
      make bootstrap
 
 6.  Commit configure, README, doc/emacs/emacs.texi,
-    doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el, nt/emacs.rc,
+    doc/lispref/elisp.texi, etc/AUTHORS, src/emacs.c, nt/emacs.rc,
     and lisp/cus-edit.el (if modified).  Copy lisp/loaddefs.el to
     lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.  For a release,
     also commit the ChangeLog files in all directories.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index b912ed4e3ff..d603d8fd0d6 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -171,7 +171,7 @@ test x"$SRC" = x && { SRC="`get_config_var srcdir`" || exit 4 ; }
 test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
-VERSION=`grep 'defconst[	 ]*emacs-version' $SRC/lisp/version.el \
+VERSION=`grep 'char emacs_version' $SRC/src/emacs.c \
          | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 
 DST_SHARE="$prefix/share/emacs/$VERSION"