Fix bug when building Emacs with a GNU Make submake.

* Makefile.in (QUIET_SUBMAKE): New macro.
(install-info, uninstall): Use it.

Fixes: debbugs:13962

2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 570c38ae2c5..f8ee8d441ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Fix bug when building Emacs with a GNU Make submake (Bug#13962).
+        * Makefile.in (QUIET_SUBMAKE): New macro.
+        (install-info, uninstall): Use it.
+
         Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
         * configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
         We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
diff --git a/Makefile.in b/Makefile.in
index b112c6abf11..bd77fa6a70d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,6 +67,10 @@ CDPATH=
 # If Make doesn't predefine MAKE, set it here.
 @SET_MAKE@
 
+# Prevent submakes from outputting "Entering directory ..." and
+# "Leaving directory..." diagnostics that would mess up 'make echo-info'.
+QUIET_SUBMAKE = MAKELEVEL=0
+
 # ==================== Things `configure' Might Edit ====================
 
 cache_file = @cache_file@
@@ -609,7 +613,9 @@ install-info: info
            [ -f dir ] || \
              (cd $${thisdir}; \
               ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
-           info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
+           info_misc=`cd $${thisdir}/doc/misc && \
+                $(QUIET_SUBMAKE) $(MAKE) -s echo-info \
+           `; \
            cd ${srcdir}/info ; \
            for elt in ${INFO_NONMISC} $${info_misc}; do \
               test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -702,7 +708,7 @@ uninstall:
         done
         -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
         thisdir=`/bin/pwd`; \
-        (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
+        (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
          if cd $(DESTDIR)${infodir}; then \
            for elt in ${INFO_NONMISC} $${info_misc}; do \
              (cd $${thisdir}; \