aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-09 13:22:11 -0700
committerGlenn Morris2010-10-09 13:22:11 -0700
commit68db69ed248540d51baf67647d87a24b891bd6b4 (patch)
treecd63a3d06bd4adf466e94ccfc8f66164e373e18e
parent0f05450f83afc96da3f131dbe8971d40026f8d77 (diff)
downloademacs-68db69ed248540d51baf67647d87a24b891bd6b4.tar.gz
emacs-68db69ed248540d51baf67647d87a24b891bd6b4.zip
Remove references to emacsver.texi.in in doc/ `make dist' rules.
* doc/emacs/Makefile.in (dist): Remove reference to emacsver.texi.in. * doc/lispref/Makefile.in (dist): Remove reference to emacsver.texi.in.
-rw-r--r--doc/emacs/ChangeLog1
-rw-r--r--doc/emacs/Makefile.in2
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/Makefile.in2
4 files changed, 3 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index bac01f7d1ce..325ca1227fd 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -11,6 +11,7 @@
11 ($(infodir)/emacs): Use $mkinfodir instead of infodir. 11 ($(infodir)/emacs): Use $mkinfodir instead of infodir.
12 12
13 * Makefile.in (distclean): Do not delete emacsver.texi. 13 * Makefile.in (distclean): Do not delete emacsver.texi.
14 (dist): Remove reference to emacsver.texi.in.
14 * emacsver.texi: New file, replacing emacsver.texi.in. 15 * emacsver.texi: New file, replacing emacsver.texi.in.
15 16
162010-10-09 Glenn Morris <rgm@gnu.org> 172010-10-09 Glenn Morris <rgm@gnu.org>
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 7a029482161..1a7d5995a5c 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -183,8 +183,6 @@ dist:
183 -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ 183 -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
184 -e "s/@ver[s]ion@/${version}/" \ 184 -e "s/@ver[s]ion@/${version}/" \
185 ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile 185 ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
186 sed -e "s/@ver[s]ion@/${version}/" \
187 ${srcdir}/emacsver.texi.in > emacs-manual-${version}/emacsver.texi
188 tar -cf emacs-manual-${version}.tar emacs-manual-${version} 186 tar -cf emacs-manual-${version}.tar emacs-manual-${version}
189 rm -rf emacs-manual-${version} 187 rm -rf emacs-manual-${version}
190 188
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ee8d7502bc5..e65f1558d21 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -9,6 +9,8 @@
9 (mkinfodir): New. 9 (mkinfodir): New.
10 ($(infodir)/elisp): Use $mkinfodir instead of infodir. 10 ($(infodir)/elisp): Use $mkinfodir instead of infodir.
11 11
12 * Makefile.in (dist): Remove reference to emacsver.texi.in.
13
122010-10-09 Glenn Morris <rgm@gnu.org> 142010-10-09 Glenn Morris <rgm@gnu.org>
13 15
14 * Makefile.in (emacsdir): New variable. 16 * Makefile.in (emacsdir): New variable.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8a21fa9c08b..245a5f92760 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -146,8 +146,6 @@ dist:
146 -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ 146 -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
147 -e "s/@ver[s]ion@/${version}/" \ 147 -e "s/@ver[s]ion@/${version}/" \
148 ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile 148 ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
149 sed -e "s/@ver[s]ion@/${version}/" \
150 ${emacsdir}/emacsver.texi.in > emacs-lispref-${version}/emacsver.texi
151 tar -cf emacs-lispref-${version}.tar emacs-lispref-${version} 149 tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
152 rm -rf emacs-lispref-${version} 150 rm -rf emacs-lispref-${version}
153 151