Update doc/ make dist rules

* emacs/Makefile.in (dist):
* lispintro/Makefile.in (dist):
* lispref/Makefile.in (dist):
* misc/Makefile.in (dist): Update for new output variables.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index af7db4bf383048712639df8ba29bda44a0774750..1626a156ea1481c564ec3582ca033b4710958a14 100644 (file)
--- 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-06  Glenn Morris  <rgm@gnu.org>
 
        * package.texi (Package Menu): The package list was changed to not

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 4a59ebed52181df27abffcf1d3754f88d49a8571..1d686959934c19adadb13c3d7d64fdc8b5700e10 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -207,6 +207,7 @@ 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}
@@ -218,6 +219,20 @@ dist:
          -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 c1607487b6f41b155b2d7e06e75baf8628e34245..72c6023bba7f0800e4226953dd59185e3867f05a 100644 (file)
--- 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-15  Á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 c041cd17e029fa76e86f106daf43cf6388ae933b..f88a8cb419b99979396b5bb18f8ad142ef6fc5fa 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -135,6 +135,20 @@ dist:
          -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 56215f8c8587fe766bf761fdcb2df6d8ff15cfc0..272f21f4570dec146dd11ed1cef9736c60e9bb85 100644 (file)
--- 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-09  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 bb8d4f82884aa35fd6cf3ec507b5a0dcc25622de..fdb643e0fc8b00255f880d9434cc334d4fc98751 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -191,6 +191,20 @@ dist:
          -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 9c3ca5dd120d07de4b2c9cd708d02fdc2253fe4b..f4291479ce10aa3196682363334b38494348b318 100644 (file)
--- 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-04  Glenn Morris  <rgm@gnu.org>
 
        * vip.texi (Other Vi Commands): Markup fix.

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index d75628926150295fcf43fcc50bd9ae4505e65f88..4254ebefde791af2284b4eabdae89b3d2dfc7368 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -890,6 +890,20 @@ dist:
          -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; \