summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGregory Heytings <gregory@heytings.org>2022-09-21 10:37:09 +0200
committerGregory Heytings <gregory@heytings.org>2022-09-21 10:37:09 +0200
commita6bad4d60f10c3c3faddced3d557c5be6b6a3c73 (patch)
tree60ab3a8514f2b0f58e36e0059eb7110af09c615f /Makefile.in
parent9b14e312f409216dab647f839724d5df029e8195 (diff)
downloademacs-a6bad4d60f10c3c3faddced3d557c5be6b6a3c73.tar.gz
; * Makefile.in: Minor improvements of failure messages.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 79a1d4204ca..4968b710a5b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,14 +380,14 @@ bootstrap-all:
actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp
# ADVICE-ON-FAILURE-BEGIN:all
-# You might try to:
+# You could 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
-# You might try to:
+# You could try to:
# - run "make extraclean" and run "make" again (or, equivalently, run
# "make bootstrap configure=default"), to rebuild Emacs with the
# default configuration options, which might fix the problem
@@ -407,6 +407,7 @@ actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lis
advice-on-failure:
@echo >&2 '***'
@echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}."
+ @echo >&2 '***'
@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-' >&2
@@ -420,6 +421,7 @@ sanity-check:
[ "X$$v" = "X3628800" ] && exit 0; \
echo >&2 '***'; \
echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \
+ echo >&2 '***'; \
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-' >&2; \