[Emacs-diffs] trunk r113064: Edit more configure variables in doc make dist rules.

[Glenn Morris]

------------------------------------------------------------
revno: 113064
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14660
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 20:49:26 -0700
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/Makefile.in          
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
  doc/lispintro/ChangeLog        changelog-20091113204419-o5vbwnq5f7feedwu-6128
  doc/lispintro/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-6130
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/Makefile.in        
makefile.in-20091113204419-o5vbwnq5f7feedwu-6156

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-06-13 22:43:33 +0000
+++ b/doc/emacs/ChangeLog       2013-06-19 03:49:26 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <address@hidden>
+
+       * Makefile.in (dist): Edit more configure variables.
+       Try to check that we do not miss any in future.
+
 2013-06-12  Xue Fuqiao  <address@hidden>
 
        * vc1-xtra.texi (Revision Tags): Add a cross reference.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2013-01-01 09:11:05 +0000
+++ b/doc/emacs/Makefile.in     2013-06-19 03:49:26 +0000
@@ -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.
 address@hidden@
@@ -195,8 +198,12 @@
          -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

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2013-04-24 19:06:20 +0000
+++ b/doc/lispintro/ChangeLog   2013-06-19 03:49:26 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2013-04-24 00:58:23 +0000
+++ b/doc/lispintro/Makefile.in 2013-06-19 03:49:26 +0000
@@ -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@
 address@hidden@
 
@@ -107,8 +109,12 @@
          -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

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-06-17 15:49:43 +0000
+++ b/doc/lispref/ChangeLog     2013-06-19 03:49:26 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <address@hidden>
+
+       * Makefile.in (dist): Edit more configure variables.
+       Try to check that we do not miss any in future.
+
 2013-06-17  Juanma Barranquero  <address@hidden>
 
        * text.texi (Undo, Changing Properties): Fix typos.

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2013-01-01 09:11:05 +0000
+++ b/doc/lispref/Makefile.in   2013-06-19 03:49:26 +0000
@@ -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 @@
          -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