aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Heytings2022-09-21 10:37:09 +0200
committerGregory Heytings2022-09-21 10:37:09 +0200
commita6bad4d60f10c3c3faddced3d557c5be6b6a3c73 (patch)
tree60ab3a8514f2b0f58e36e0059eb7110af09c615f
parent9b14e312f409216dab647f839724d5df029e8195 (diff)
downloademacs-a6bad4d60f10c3c3faddced3d557c5be6b6a3c73.tar.gz
emacs-a6bad4d60f10c3c3faddced3d557c5be6b6a3c73.zip
; * Makefile.in: Minor improvements of failure messages.
-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:
380actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp 380actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp
381 381
382# ADVICE-ON-FAILURE-BEGIN:all 382# ADVICE-ON-FAILURE-BEGIN:all
383# You might try to: 383# You could try to:
384# - run "make bootstrap", which might fix the problem 384# - run "make bootstrap", which might fix the problem
385# - run "make V=1", which displays the full commands invoked by make, 385# - run "make V=1", which displays the full commands invoked by make,
386# to further investigate the problem 386# to further investigate the problem
387# ADVICE-ON-FAILURE-END:all 387# ADVICE-ON-FAILURE-END:all
388 388
389# ADVICE-ON-FAILURE-BEGIN:bootstrap 389# ADVICE-ON-FAILURE-BEGIN:bootstrap
390# You might try to: 390# You could try to:
391# - run "make extraclean" and run "make" again (or, equivalently, run 391# - run "make extraclean" and run "make" again (or, equivalently, run
392# "make bootstrap configure=default"), to rebuild Emacs with the 392# "make bootstrap configure=default"), to rebuild Emacs with the
393# default configuration options, which might fix the problem 393# default configuration options, which might fix the problem
@@ -407,6 +407,7 @@ actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lis
407advice-on-failure: 407advice-on-failure:
408 @echo >&2 '***' 408 @echo >&2 '***'
409 @echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}." 409 @echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}."
410 @echo >&2 '***'
410 @cat Makefile | \ 411 @cat Makefile | \
411 sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \ 412 sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
412 sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2 413 sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2
@@ -420,6 +421,7 @@ sanity-check:
420 [ "X$$v" = "X3628800" ] && exit 0; \ 421 [ "X$$v" = "X3628800" ] && exit 0; \
421 echo >&2 '***'; \ 422 echo >&2 '***'; \
422 echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ 423 echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \
424 echo >&2 '***'; \
423 cat Makefile | \ 425 cat Makefile | \
424 sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \ 426 sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
425 sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2; \ 427 sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2; \