Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

8 files changed, 77 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b1be1416a77..23e1d0dff76 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Update for new output variables.
+
 2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index e9894ac2207..352768517fa 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -209,6 +209,7 @@ bootstrap-clean maintainer-clean: distclean infoclean
 
 ## 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}
@@ -219,6 +220,21 @@ dist:
           -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; \
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 70d7767635f..6ccac447134 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Update for new output variables.
+
 2014-07-16  Álvar Jesús Ibeas Martín  <alvar.ibeas@unican.es>  (tiny change)
 
         * emacs-lisp-intro.texi (Variables, Buffer Names, if & or)
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index b40c26767cc..49d3fe3c957 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -134,6 +134,21 @@ dist:
           -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; \
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8ec524cc534..3955bd09b38 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Update for new output variables.
+
 2014-10-12  Glenn Morris  <rgm@gnu.org>
 
         * elisp.texi (DATE): Bump to October 2014.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 2919d97b3a3..22955fb9bae 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -192,6 +192,21 @@ dist:
           -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; \
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 70207de3b3b..23c3e66b86f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Update for new output variables.
+
 2014-10-08  Leo Liu  <sdl.web@gmail.com>
 
         * cl.texi (Porting Common Lisp): Remove parse-integer.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index dee3eff2caf..250d3c39c45 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -251,6 +251,21 @@ dist:
           -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; \