3 files changed, 9 insertions, 6 deletions

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 5652b8b804d..2fec57f838b 100644
--- 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 80987d359b7..b60c752e92b 100644
--- 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 34c23218f2f..19cf2cc4a5d 100644
--- 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