aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2012-12-12 18:52:01 +0100
committerAndreas Schwab2012-12-12 18:52:01 +0100
commit0f59daafb7912f1e0057fd62e3bbb8bcb5693913 (patch)
tree383e5c81bbef834863cebaa62f446e8ea234079d
parent4c2dd4eeffd612508159b8c5f3d51e2e1bf4bf11 (diff)
downloademacs-0f59daafb7912f1e0057fd62e3bbb8bcb5693913.tar.gz
emacs-0f59daafb7912f1e0057fd62e3bbb8bcb5693913.zip
* 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 @@
12012-12-12 Andreas Schwab <schwab@suse.de>
2
3 * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
4 (uninstall): Likewise.
5
12012-12-12 Glenn Morris <rgm@gnu.org> 62012-12-12 Glenn Morris <rgm@gnu.org>
2 7
3 * info/dir: Add srecode. 8 * 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
603 [ -f dir ] || \ 603 [ -f dir ] || \
604 (cd $${thisdir}; \ 604 (cd $${thisdir}; \
605 ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ 605 ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
606 info_misc=`cd $${thisdir}/doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \ 606 info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
607 cd ${srcdir}/info ; \ 607 cd ${srcdir}/info ; \
608 for elt in ${INFO_NONMISC} $${info_misc}; do \ 608 for elt in ${INFO_NONMISC} $${info_misc}; do \
609 test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ 609 test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -685,7 +685,7 @@ uninstall:
685 done 685 done
686 -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} 686 -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
687 thisdir=`/bin/pwd`; \ 687 thisdir=`/bin/pwd`; \
688 (info_misc=`cd doc/misc; LANG=C ${MAKE} echo-info | sed '/ing directory/d'`; \ 688 (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
689 if cd $(DESTDIR)${infodir}; then \ 689 if cd $(DESTDIR)${infodir}; then \
690 for elt in ${INFO_NONMISC} $${info_misc}; do \ 690 for elt in ${INFO_NONMISC} $${info_misc}; do \
691 (cd $${thisdir}; \ 691 (cd $${thisdir}; \