Include version number in doc `make dist' tarfiles.

* doc/lispref/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/lispintro/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/emacs/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

2 files changed, 18 insertions, 11 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7edf32e6f40..102866b0a82 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (dist): Use version in tar name.
+
 2010-10-06  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in: Rearrange to more closely resemble doc/emacs/Makefile.
@@ -8684,11 +8690,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+    2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8704,5 +8709,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 90b95820ed6..b91b05dce2a 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -27,6 +27,8 @@ srcdir = @srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
+version=@version@
+
 infodir = ../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
@@ -118,6 +120,7 @@ mostlyclean:
 
 clean: mostlyclean
         rm -f elisp.dvi elisp.pdf vol[12].pdf
+        rm -f emacs-lispref-${version}.tar*
 
 distclean: clean
 
@@ -128,14 +131,15 @@ maintainer-clean: distclean infoclean
 
 ## Note this excludes the two-volume stuff.
 dist:
-        rm -rf lispref
-        mkdir lispref
+        rm -rf emacs-lispref-${version}
+        mkdir emacs-lispref-${version}
         cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-          ${srcdir}/ChangeLog* ${srcdir}/README lispref/
+          ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispref-${version}/
         sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
           -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-          ${srcdir}/Makefile.in > lispref/Makefile
-        tar -cf elisp-texi.tar lispref
-        rm -rf lispref
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+        tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
+        rm -rf emacs-lispref-${version}
 
 ### Makefile ends here