Tweak regexp in previous doc/*/Makefile.in change, make error fatal

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 5652b8b..2fec57f 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -201,9 +201,10 @@ dist:
          -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
+       @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
+         echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+       fi
        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/Makefile.in b/doc/lispintro/Makefile.in
index 80987d3..b60c752 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -112,9 +112,10 @@ dist:
          -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
+       @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
+         echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+       fi
        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/Makefile.in b/doc/lispref/Makefile.in
index 34c2321..19cf2cc 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -169,9 +169,10 @@ dist:
          -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
+       @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
+         echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+       fi
        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