Commit 17ca7950 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent fd9ba500
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
......@@ -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
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
......@@ -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
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
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment