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.

7 files changed, 58 insertions, 40 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 11e56492763..793645d6dfe 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/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 (EMACS_XTRA): Add the main source file.
@@ -7367,12 +7373,11 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-      2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -7388,5 +7393,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: f1d62776-3ed5-4811-9d96-267252577dbd
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index fe11a04ca83..8c8f9b93729 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -28,6 +28,9 @@ srcdir=@srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
+# Only for make dist.
+version=@version@
+
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
 infodir=../../info
@@ -148,6 +151,7 @@ mostlyclean:
 ## Products not in the release tarfiles.
 clean: mostlyclean
         rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf
+        rm -f emacs-manual-${version}.tar*
 
 distclean: clean
 
@@ -161,15 +165,16 @@ maintainer-clean: distclean infoclean
 ## The [c] is a dumb way to prevent configure expanding it.
 ## The emacs: rule becomes circular when we change infodir to ".".
 dist:
-        rm -rf emacs
-        mkdir emacs
+        rm -rf emacs-manual-${version}
+        mkdir emacs-manual-${version}
         cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-          ${srcdir}/ChangeLog* emacs/
+          ${srcdir}/ChangeLog* emacs-manual-${version}/
         sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
           -e 's/\(infodir *=\).*/\1 ./' -e '/^emacs *:/d' \
           -e 's/^\(clean:.*\)/\1 infoclean/' \
-          ${srcdir}/Makefile.in > emacs/Makefile
-        tar -cf emacs-texi.tar emacs
-        rm -rf emacs
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
+        tar -cf emacs-manual-${version}.tar emacs-manual-${version}
+        rm -rf emacs-manual-${version}
 
 ### Makefile ends here
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index c8550e5db73..8489dbb4a15 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/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 (SHELL): Use /bin/sh, like every other Makefile.in.
@@ -406,11 +412,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-        2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+    2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -426,5 +431,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: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 3ebca19a0f0..a01a9bb9605 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -23,6 +23,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 VPATH = @srcdir@
+version=@version@
 
 infodir = ../../info
 # Directory with the (customized) texinfo.tex file.
@@ -70,6 +71,7 @@ mostlyclean:
 clean: mostlyclean
         rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf
         rm -rf emacs-lisp-intro.html/
+        rm -f emacs-lispintro-${version}.tar*
 
 distclean: clean
 
@@ -79,15 +81,16 @@ infoclean:
 maintainer-clean: distclean infoclean
 
 dist:
-        rm -rf lispintro
-        mkdir lispintro
+        rm -rf emacs-lispintro-${version}
+        mkdir emacs-lispintro-${version}
         cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \
           ${texinfodir}/texinfo.tex \
-          ${srcdir}/ChangeLog* ${srcdir}/README lispintro/
+          ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
         sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
           -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-          ${srcdir}/Makefile.in > lispintro/Makefile
-        tar -cf emacs-lisp-intro-texi.tar lispintro
-        rm -rf lispintro
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+        tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
+        rm -rf emacs-lispintro-${version}
 
 ### Makefile ends here
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
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 02a4d3e5bcb..22208f6763d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -7058,12 +7058,11 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-      2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -7079,5 +7078,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: 08b2903e-900c-4c72-a4a9-e76416a80803