From: Glenn Morris <rgm@gnu.org>
Date: Wed, 5 Nov 2014 05:01:47 +0000 (-0800)
Subject: * Makefile.in (install-info, uninstall): Use --no-print-directory.
X-Git-Tag: emacs-25.0.90~2635^2~569
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fdcbfeac69b3e9c7edb114d47beb7e9ac9d10df4;p=emacs.git

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

Fixes: debbugs:18908
---

diff --git a/ChangeLog b/ChangeLog
index 56f08c1d5be..6fa196a627e 100644
--- 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 2f7294073b7..0c11828deb2 100644
--- 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}"; \