summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGregory Heytings <gregory@heytings.org>2022-09-19 06:39:08 +0000
committerGregory Heytings <gregory@heytings.org>2022-09-19 08:40:28 +0200
commite54da280ff4bf458c437f87dd64e848cdc75479c (patch)
tree8f44994d29bab078e5a73f638769ad1278ae0c7b /Makefile.in
parent731c453b035c1c61af9a76d44680a7e4c660eaaf (diff)
downloademacs-e54da280ff4bf458c437f87dd64e848cdc75479c.tar.gz
; * Makefile.in: Partly revert 5b3c4004a9.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in26
1 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 9c9923a1f67..de263c6858b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,26 +380,26 @@ bootstrap-all:
actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp
# ADVICE-ON-FAILURE-BEGIN:all
-# It can help to run "make bootstrap", which can resolve many build
-# failures caused by incrementally building from a previously built
-# checkout.
-
-# 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.
+# You might try to:
+# - run "make bootstrap", which might fix the problem
+# - run "make V=1", which displays the full commands invoked by make,
+#   to further investigate the problem
# ADVICE-ON-FAILURE-END:all
# ADVICE-ON-FAILURE-BEGIN:bootstrap
-# If "make bootstrap" failed, try running "make extraclean" and then
-# "make bootstrap" again. If that still fails and you are building
-# Emacs from a repository checkout, run "git clean -fdx" and retry
-# "make bootstrap". Otherwise, please report a bug by sending email
-# to bug-gnu-emacs@gnu.org.
+# You might try to:
+# - run "git clean -fdx" and run "make bootstrap" again, which might
+#   fix the problem
+#   !BEWARE! "git clean -fdx" deletes all files that are not under
+#   !BEWARE! version control, which means that all changes to such
+#   !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:
@echo
- @echo "make ${make-target}\" failed with exit status ${exit-status}."
+ @echo " \"make ${make-target}\" failed with exit status ${exit-status}."
@cat Makefile | \
sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
sed 's/^# //' | grep -v '^ADVICE-ON-FAILURE-'