Revert "; * Makefile.in: Partly revert 5b3c4004a9."

This reverts commit e54da280ff.
This commit is contained in:
Po Lu 2022-09-19 15:19:23 +08:00
parent a39e03d7cd
commit b2d419ed5b

View file

@ -380,26 +380,26 @@ bootstrap-all:
actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp
# ADVICE-ON-FAILURE-BEGIN:all # ADVICE-ON-FAILURE-BEGIN:all
# You might try to: # It can help to run "make bootstrap", which can resolve many build
# - run "make bootstrap", which might fix the problem # failures caused by incrementally building from a previously built
# - run "make V=1", which displays the full commands invoked by make, # checkout.
#   to further investigate the problem
# Failing that, running "make V=1" will cause Make to display the full
# commands it invokes to build Emacs, which helps to investigate the
# problem.
# ADVICE-ON-FAILURE-END:all # ADVICE-ON-FAILURE-END:all
# ADVICE-ON-FAILURE-BEGIN:bootstrap # ADVICE-ON-FAILURE-BEGIN:bootstrap
# You might try to: # If "make bootstrap" failed, try running "make extraclean" and then
# - run "git clean -fdx" and run "make bootstrap" again, which might # "make bootstrap" again. If that still fails and you are building
#   fix the problem # Emacs from a repository checkout, run "git clean -fdx" and retry
#   !BEWARE! "git clean -fdx" deletes all files that are not under # "make bootstrap". Otherwise, please report a bug by sending email
#   !BEWARE! version control, which means that all changes to such # to bug-gnu-emacs@gnu.org.
#   !BEWARE! files will be lost and cannot be restored later
# - run "make V=1", which displays the full commands invoked by make,
#   to further investigate the problem
# ADVICE-ON-FAILURE-END:bootstrap # ADVICE-ON-FAILURE-END:bootstrap
advice-on-failure: advice-on-failure:
@echo @echo
@echo " \"make ${make-target}\" failed with exit status ${exit-status}." @echo "make ${make-target}\" failed with exit status ${exit-status}."
@cat Makefile | \ @cat Makefile | \
sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \ sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
sed 's/^# //' | grep -v '^ADVICE-ON-FAILURE-' sed 's/^# //' | grep -v '^ADVICE-ON-FAILURE-'