Merge from emacs-24; up to 117691

2 files changed, 6 insertions, 40 deletions

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