Merge from emacs-24; up to 117691

8 files changed, 24 insertions, 161 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9dc3af97788..8e85c890285 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): Remove variable.
+        (clean): No longer delete dist tarfile.
+        (dist): Remove rule; replace with code in admin.el.
+
 2014-11-03  Glenn Morris  <rgm@gnu.org>
 
         * programs.texi (Misc for Programs): Fix typo.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 352768517fa..67c324e1f9d 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -26,9 +26,6 @@ SHELL = @SHELL@
 # of the source tree.  This is set by configure's `--srcdir' option.
 srcdir=@srcdir@
 
-# Only for make dist.
-version=@version@
-
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
 ## This is a bit funny.  Because the info files are in the
@@ -191,7 +188,6 @@ mostlyclean:
 ## Products not in the release tarfiles.
 clean: mostlyclean
         rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
-        rm -f emacs-manual-${version}.tar*
 
 distclean: clean
         rm -f Makefile
@@ -205,44 +201,6 @@ infoclean:
 
 bootstrap-clean maintainer-clean: distclean infoclean
 
-.PHONY: dist
-
-## Make a standalone tarfile of the Emacs manual sources.
-## The [c] is a dumb way to prevent configure expanding it.
-## TODO this is getting increasingly lengthy; not sure it is worth keeping.
-dist:
-        rm -rf emacs-manual-${version}
-        mkdir emacs-manual-${version}
-        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-          ${srcdir}/ChangeLog* emacs-manual-${version}/
-        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-          -e 's/^\(buildinfodir *=\).*/\1 ./' \
-          -e 's/^\(clean:.*\)/\1 infoclean/' \
-          -e "s/@ver[s]ion@/${version}/" \
-          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
-          -e 's|@SH[E]LL@|/bin/bash|' \
-          -e 's|@[p]refix@|/usr/local|' \
-          -e 's|@[d]atarootdir@|$${prefix}/share|' \
-          -e 's|@[d]atadir@|$${datarootdir}|' \
-          -e 's|@[P]ACKAGE_TARNAME@|emacs|' \
-          -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \
-          -e 's|@[d]vidir@|$${docdir}|' \
-          -e 's|@[h]tmldir@|$${docdir}|' \
-          -e 's|@[p]dfdir@|$${docdir}|' \
-          -e 's|@[p]sdir@|$${docdir}|' \
-          -e 's|@[G]ZIP_PROG@|gzip|' \
-          -e 's|@IN[S]TALL@|install -c|' \
-          -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \
-          -e '/@[c]onfigure_input@/d' \
-          ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
-        @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
-          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
-        fi
-        tar -cf emacs-manual-${version}.tar emacs-manual-${version}
-        rm -rf emacs-manual-${version}
-
-
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 
 install-dvi: dvi
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 37f8ac9da0e..572875c151a 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): Remove variable.
+        (clean): No longer delete dist tarfile.
+        (dist): Remove rule; replace with code in admin.el.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Merge in all changes up to 24.4 release.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 49d3fe3c957..4bcbb53ad9a 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -19,10 +19,7 @@
 
 SHELL = @SHELL@
 
-# NB If you add any more configure variables,
-# update the sed rules in the dist target below.
 srcdir = @srcdir@
-version=@version@
 
 buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
@@ -108,7 +105,6 @@ mostlyclean:
 
 clean: mostlyclean
         rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
-        rm -f emacs-lispintro-${version}.tar*
 
 distclean: clean
         rm -f Makefile
@@ -120,43 +116,6 @@ infoclean:
 
 bootstrap-clean maintainer-clean: distclean infoclean
 
-.PHONY: dist
-
-dist:
-        rm -rf emacs-lispintro-${version}
-        mkdir emacs-lispintro-${version}
-        cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \
-          ${texinfodir}/texinfo.tex ${emacsdir}/emacsver.texi \
-          ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
-        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-          -e 's/^\(emacsdir *=\).*/\1 ./' \
-          -e 's/^\(buildinfodir *=\).*/\1 ./' \
-          -e 's/^\(clean:.*\)/\1 infoclean/' \
-          -e "s/@ver[s]ion@/${version}/" \
-          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
-          -e 's|@SH[E]LL@|/bin/bash|' \
-          -e 's|@[p]refix@|/usr/local|' \
-          -e 's|@[d]atarootdir@|$${prefix}/share|' \
-          -e 's|@[d]atadir@|$${datarootdir}|' \
-          -e 's|@[P]ACKAGE_TARNAME@|emacs|' \
-          -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \
-          -e 's|@[d]vidir@|$${docdir}|' \
-          -e 's|@[h]tmldir@|$${docdir}|' \
-          -e 's|@[p]dfdir@|$${docdir}|' \
-          -e 's|@[p]sdir@|$${docdir}|' \
-          -e 's|@[G]ZIP_PROG@|gzip|' \
-          -e 's|@IN[S]TALL@|install -c|' \
-          -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \
-          -e '/@[c]onfigure_input@/d' \
-          ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
-        @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
-          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
-        fi
-        tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
-        rm -rf emacs-lispintro-${version}
-
-
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 
 install-dvi: dvi
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9a7a6c8c8a6..83a842372a0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): Remove variable.
+        (clean): No longer delete dist tarfile.
+        (dist): Remove rule; replace with code in admin.el.
+
 2014-11-07  Martin Rudalics  <rudalics@gmx.at>
 
         * frames.texi (Size and Position): Rewrite description of
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 22955fb9bae..11cc0ecc10e 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -25,8 +25,6 @@ SHELL = @SHELL@
 # Standard configure variables.
 srcdir = @srcdir@
 
-version=@version@
-
 buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
@@ -164,7 +162,6 @@ mostlyclean:
 clean: mostlyclean
         rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
         rm -f vol[12].dvi vol[12].pdf vol[12].ps
-        rm -f emacs-lispref-${version}.tar*
 
 distclean: clean
         rm -f Makefile
@@ -177,43 +174,6 @@ infoclean:
 
 bootstrap-clean maintainer-clean: distclean infoclean
 
-.PHONY: dist
-
-## Note this excludes the two-volume stuff.
-dist:
-        rm -rf emacs-lispref-${version}
-        mkdir emacs-lispref-${version}
-        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
-          $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
-          ${srcdir}/README emacs-lispref-${version}/
-        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-          -e 's/^\(emacsdir *=\).*/\1 ./' \
-          -e 's/^\(buildinfodir *=\).*/\1 ./' \
-          -e 's/^\(clean:.*\)/\1 infoclean/' \
-          -e "s/@ver[s]ion@/${version}/" \
-          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
-          -e 's|@SH[E]LL@|/bin/bash|' \
-          -e 's|@[p]refix@|/usr/local|' \
-          -e 's|@[d]atarootdir@|$${prefix}/share|' \
-          -e 's|@[d]atadir@|$${datarootdir}|' \
-          -e 's|@[P]ACKAGE_TARNAME@|emacs|' \
-          -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \
-          -e 's|@[d]vidir@|$${docdir}|' \
-          -e 's|@[h]tmldir@|$${docdir}|' \
-          -e 's|@[p]dfdir@|$${docdir}|' \
-          -e 's|@[p]sdir@|$${docdir}|' \
-          -e 's|@[G]ZIP_PROG@|gzip|' \
-          -e 's|@IN[S]TALL@|install -c|' \
-          -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \
-          -e '/@[c]onfigure_input@/d' \
-          ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
-        @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
-          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
-        fi
-        tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
-        rm -rf emacs-lispref-${version}
-
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 
 install-dvi: dvi
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 58d1a1080df..8aef62bc6a6 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): Remove variable.
+        (clean): No longer delete dist tarfile.
+        (dist): Remove rule; replace with code in admin.el.
+
 2014-11-08  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (${buildinfodir}/ccmode.info)
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 7a2287af710..40a072a7978 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -23,8 +23,6 @@ SHELL = @SHELL@
 # of the source tree.  This is set by configure's `--srcdir' option.
 srcdir=@srcdir@
 
-version=@version@
-
 ## Where the output files go.
 ## Note that all the Info targets build the Info files in srcdir.
 ## There is no provision for Info files to exist in the build directory.
@@ -222,7 +220,6 @@ mostlyclean:
 
 clean: mostlyclean
         rm -f *.dvi *.html *.pdf *.ps
-        rm -f emacs-misc-${version}.tar*
 
 distclean: clean
         rm -f Makefile
@@ -239,41 +236,6 @@ infoclean:
 
 bootstrap-clean maintainer-clean: distclean infoclean
 
-dist:
-        rm -rf emacs-misc-${version}
-        mkdir emacs-misc-${version}
-        cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \
-          $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
-          emacs-misc-${version}/
-        sed -e 's/@sr[c]dir@/./' \
-          -e 's/^\(emacsdir *=\).*/\1 ./' \
-          -e 's/^\(buildinfodir *=\).*/\1 ./' \
-          -e 's/^\(clean:.*\)/\1 infoclean/' \
-          -e "s/@ver[s]ion@/${version}/" \
-          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
-          -e 's|@SH[E]LL@|/bin/bash|' \
-          -e 's|@[p]refix@|/usr/local|' \
-          -e 's|@[d]atarootdir@|$${prefix}/share|' \
-          -e 's|@[d]atadir@|$${datarootdir}|' \
-          -e 's|@[P]ACKAGE_TARNAME@|emacs|' \
-          -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \
-          -e 's|@[d]vidir@|$${docdir}|' \
-          -e 's|@[h]tmldir@|$${docdir}|' \
-          -e 's|@[p]dfdir@|$${docdir}|' \
-          -e 's|@[p]sdir@|$${docdir}|' \
-          -e 's|@[G]ZIP_PROG@|gzip|' \
-          -e 's|@IN[S]TALL@|install -c|' \
-          -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \
-          -e '/@[c]onfigure_input@/d' \
-          ${srcdir}/Makefile.in > emacs-misc-${version}/Makefile
-        @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
-          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
-        fi
-        tar -cf emacs-misc-${version}.tar emacs-misc-${version}
-        rm -rf emacs-misc-${version}
-
-
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 
 install-dvi: dvi