diff options
| author | Gregory Heytings | 2022-09-19 06:39:08 +0000 |
|---|---|---|
| committer | Gregory Heytings | 2022-09-19 08:40:28 +0200 |
| commit | e54da280ff4bf458c437f87dd64e848cdc75479c (patch) | |
| tree | 8f44994d29bab078e5a73f638769ad1278ae0c7b | |
| parent | 731c453b035c1c61af9a76d44680a7e4c660eaaf (diff) | |
| download | emacs-e54da280ff4bf458c437f87dd64e848cdc75479c.tar.gz emacs-e54da280ff4bf458c437f87dd64e848cdc75479c.zip | |
; * Makefile.in: Partly revert 5b3c4004a9.
| -rw-r--r-- | Makefile.in | 26 |
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: | |||
| 380 | actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp | 380 | actual-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 | # It can help to run "make bootstrap", which can resolve many build | 383 | # You might try to: |
| 384 | # failures caused by incrementally building from a previously built | 384 | # - run "make bootstrap", which might fix the problem |
| 385 | # checkout. | 385 | # - run "make V=1", which displays the full commands invoked by make, |
| 386 | 386 | # to further investigate the problem | |
| 387 | # Failing that, running "make V=1" will cause Make to display the full | ||
| 388 | # commands it invokes to build Emacs, which helps to investigate the | ||
| 389 | # problem. | ||
| 390 | # ADVICE-ON-FAILURE-END:all | 387 | # ADVICE-ON-FAILURE-END:all |
| 391 | 388 | ||
| 392 | # ADVICE-ON-FAILURE-BEGIN:bootstrap | 389 | # ADVICE-ON-FAILURE-BEGIN:bootstrap |
| 393 | # If "make bootstrap" failed, try running "make extraclean" and then | 390 | # You might try to: |
| 394 | # "make bootstrap" again. If that still fails and you are building | 391 | # - run "git clean -fdx" and run "make bootstrap" again, which might |
| 395 | # Emacs from a repository checkout, run "git clean -fdx" and retry | 392 | # fix the problem |
| 396 | # "make bootstrap". Otherwise, please report a bug by sending email | 393 | # !BEWARE! "git clean -fdx" deletes all files that are not under |
| 397 | # to bug-gnu-emacs@gnu.org. | 394 | # !BEWARE! version control, which means that all changes to such |
| 395 | # !BEWARE! files will be lost and cannot be restored later | ||
| 396 | # - run "make V=1", which displays the full commands invoked by make, | ||
| 397 | # to further investigate the problem | ||
| 398 | # ADVICE-ON-FAILURE-END:bootstrap | 398 | # ADVICE-ON-FAILURE-END:bootstrap |
| 399 | 399 | ||
| 400 | advice-on-failure: | 400 | advice-on-failure: |
| 401 | @echo | 401 | @echo |
| 402 | @echo "make ${make-target}\" failed with exit status ${exit-status}." | 402 | @echo " \"make ${make-target}\" failed with exit status ${exit-status}." |
| 403 | @cat Makefile | \ | 403 | @cat Makefile | \ |
| 404 | sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \ | 404 | sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \ |
| 405 | sed 's/^# //' | grep -v '^ADVICE-ON-FAILURE-' | 405 | sed 's/^# //' | grep -v '^ADVICE-ON-FAILURE-' |