summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2012-12-12 18:52:01 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2012-12-12 18:52:01 +0100
commit0f59daafb7912f1e0057fd62e3bbb8bcb5693913 (patch)
tree383e5c81bbef834863cebaa62f446e8ea234079d
parent4c2dd4eeffd612508159b8c5f3d51e2e1bf4bf11 (diff)
downloademacs-0f59daafb7912f1e0057fd62e3bbb8bcb5693913.tar.gz
* Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
(uninstall): Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2540eaee5da..3ee854acf0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-12 Andreas Schwab <schwab@suse.de>
+
+ * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
+ (uninstall): Likewise.
+
2012-12-12 Glenn Morris <rgm@gnu.org>
* info/dir: Add srecode.
diff --git a/Makefile.in b/Makefile.in
index e8a506e7cea..bec9b0eea14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -603,7 +603,7 @@ install-info: info
[ -f dir ] || \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
- info_misc=`cd $${thisdir}/doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \
+ info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -685,7 +685,7 @@ uninstall:
done
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
thisdir=`/bin/pwd`; \
- (info_misc=`cd doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \
+ (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
if cd $(DESTDIR)${infodir}; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd $${thisdir}; \