[Emacs-diffs] /srv/bzr/emacs/trunk r112086: Fix bug when building Emacs with a GNU Make submake.

[Paul Eggert]

------------------------------------------------------------
revno: 112086
fixes bug: http://debbugs.gnu.org/13962
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-18 14:02:34 -0700
message:
  Fix bug when building Emacs with a GNU Make submake.
  
  * Makefile.in (QUIET_SUBMAKE): New macro.
  (install-info, uninstall): Use it.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-18 05:26:56 +0000
+++ b/ChangeLog 2013-03-18 21:02:34 +0000
@@ -1,5 +1,9 @@
 2013-03-18  Paul Eggert  <address@hidden>
 
+       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

=== modified file 'Makefile.in'
--- a/Makefile.in       2013-03-05 03:59:35 +0000
+++ b/Makefile.in       2013-03-18 21:02:34 +0000
@@ -67,6 +67,10 @@
 # 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 @@
           [ -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 @@
        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}; \