Merge from emacs-24; up to 117691

2 files changed, 6 insertions, 41 deletions

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