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

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c3a7343aa8f2cdb14662de9f4979c3e2191dd51c..12269c7ce32b82a30010a57fbec0e16629798e7d 100644 (file)
--- 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 43de825ea7050a9df8442625bec8495e4e9fe81a..5652b8b804deb1de71465224115b4da8b4521afa 100644 (file)
--- 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 5e4655506f6f9343f4c4e47d5098f87e9326ea11..8905fb32f2c7d532194844d1493b6523fae20a7a 100644 (file)
--- 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 338b4ad86c4a36ebc7eb4661ffc3404333417f40..80987d359b7bc9b2e5f5c892c7059b92af209d06 100644 (file)
--- 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 47a6a84db06adefc0f9f15ca95d64b1d75bbd628..8572fbe3e881e0e2a674f31ebcbbbfcdb762a190 100644 (file)
--- 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 8e04d085c60c09a34e9a8bf57b2f08abb66b7e61..34c23218f2f9ef2f3dfb03bc4cec283a14180754 100644 (file)
--- 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