Fix bug when building Emacs with a GNU Make submake.
* Makefile.in (QUIET_SUBMAKE): New macro. (install-info, uninstall): Use it. Fixes: debbugs:13962
This commit is contained in:
parent
2aa2157b56
commit
4c9a137782
2 changed files with 12 additions and 2 deletions
|
@ -1,5 +1,9 @@
|
|||
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix bug when building Emacs with a GNU Make submake (Bug#13962).
|
||||
* Makefile.in (QUIET_SUBMAKE): New macro.
|
||||
(install-info, uninstall): Use it.
|
||||
|
||||
Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
|
||||
* configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
|
||||
We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
|
||||
|
|
10
Makefile.in
10
Makefile.in
|
@ -67,6 +67,10 @@ 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@
|
||||
|
@ -609,7 +613,9 @@ install-info: info
|
|||
[ -f dir ] || \
|
||||
(cd $${thisdir}; \
|
||||
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
|
||||
info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
|
||||
info_misc=`cd $${thisdir}/doc/misc && \
|
||||
$(QUIET_SUBMAKE) $(MAKE) -s echo-info \
|
||||
`; \
|
||||
cd ${srcdir}/info ; \
|
||||
for elt in ${INFO_NONMISC} $${info_misc}; do \
|
||||
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
|
||||
|
@ -702,7 +708,7 @@ uninstall:
|
|||
done
|
||||
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
|
||||
thisdir=`/bin/pwd`; \
|
||||
(info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
|
||||
(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
|
||||
if cd $(DESTDIR)${infodir}; then \
|
||||
for elt in ${INFO_NONMISC} $${info_misc}; do \
|
||||
(cd $${thisdir}; \
|
||||
|
|
Loading…
Add table
Reference in a new issue