summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-11-04 21:01:47 -0800
committerGlenn Morris <rgm@gnu.org>2014-11-04 21:01:47 -0800
commitfdcbfeac69b3e9c7edb114d47beb7e9ac9d10df4 (patch)
tree21dbcb8d40ff634b6f821de95af2b8e3deb0a8e3 /Makefile.in
parenta9f1618de84c72516aae1c4d054d44d2b36750d2 (diff)
downloademacs-fdcbfeac69b3e9c7edb114d47beb7e9ac9d10df4.tar.gz
* Makefile.in (install-info, uninstall): Use --no-print-directory.
(QUIET_SUBMAKE): Remove. Fixes: debbugs:18908
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 2 insertions, 6 deletions
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}"; \