Edit more configure variables in doc make dist rules.

* doc/emacs/Makefile.in (dist):
* doc/lispintro/Makefile.in (dist):
* doc/lispref/Makefile.in (dist): Edit more configure variables.
Try to check that we do not miss any in future.

Fixes: debbugs:14660

6 files changed, 35 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c3a7343aa8f..12269c7ce32 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.
+        Try to check that we do not miss any in future.
+
 2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
 
         * vc1-xtra.texi (Revision Tags): Add a cross reference.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 43de825ea70..5652b8b804d 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -19,6 +19,9 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
+
 # Where to find the source code.  $(srcdir) will be the doc/emacs subdirectory
 # of the source tree.  This is set by configure's `--srcdir' option.
 srcdir=@srcdir@
@@ -195,8 +198,12 @@ dist:
           -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@//' \
           ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
         tar -cf emacs-manual-${version}.tar emacs-manual-${version}
+        @grep '@[A-Z]*@' emacs-manual-${version}/Makefile && \
+          echo "WARNING: Unexpanded configure variables in Makefile?" || true
         rm -rf emacs-manual-${version}
 
 ### Makefile ends here
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 5e4655506f6..8905fb32f2c 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.  (Bug#14660)
+        Try to check that we do not miss any in future.
+
 2013-04-24  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 338b4ad86c4..80987d359b7 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -19,6 +19,8 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
 srcdir = @srcdir@
 version=@version@
 
@@ -107,8 +109,12 @@ dist:
           -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@//' \
           ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
         tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
+        @grep '@[A-Z]*@' emacs-lispintro-${version}/Makefile && \
+          echo "WARNING: Unexpanded configure variables in Makefile?" || true
         rm -rf emacs-lispintro-${version}
 
 ### Makefile ends here
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 47a6a84db06..8572fbe3e88 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.
+        Try to check that we do not miss any in future.
+
 2013-06-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * text.texi (Undo, Changing Properties): Fix typos.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8e04d085c60..34c23218f2f 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -19,6 +19,9 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
+
 # Standard configure variables.
 srcdir = @srcdir@
 
@@ -163,8 +166,12 @@ dist:
           -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@//' \
           ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
         tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
+        @grep '@[A-Z]*@' emacs-lispref-${version}/Makefile && \
+          echo "WARNING: Unexpanded configure variables in Makefile?" || true
         rm -rf emacs-lispref-${version}
 
 ### Makefile ends here