* Makefile.in (install-info, uninstall): Use --no-print-directory.

(QUIET_SUBMAKE): Remove.

Fixes: debbugs:18908

diff --git a/ChangeLog b/ChangeLog
index 56f08c1d5be05704628b743e307344aeb1a501e5..6fa196a627ea31a6985065293232c8853e08642d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-05  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (QUIET_SUBMAKE): Remove.
+       (install-info, uninstall): Use --no-print-directory.  (Bug#18908)
+
 2014-10-25  Eric S. Raymond  <esr@thyrsus.com>
 
        * autogen.sh: Neutralize language specific to a repository type.

diff --git a/Makefile.in b/Makefile.in
index 2f7294073b764b5d74054d3f69009b86d6afc18d..0c11828deb22250b9e87951dc0bcbe9ca8586422 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,10 +67,6 @@ 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@
@@ -641,7 +637,7 @@ install-info: info
           [ -f "$(DESTDIR)${infodir}/dir" ] || \
              [ ! -f ${srcdir}/info/dir ] || \
              ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
-          info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
+          info_misc=`$(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
           cd ${srcdir}/info ; \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
              test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -738,7 +734,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
        done
        -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
        thisdir=`/bin/pwd`; \
-       (info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
+       (info_misc=`$(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
         if cd "$(DESTDIR)${infodir}"; then \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
             (cd "$${thisdir}"; \