diff options
| author | Paul Eggert | 2019-04-10 10:06:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-04-10 10:06:53 -0700 |
| commit | d2255c6065b0bc3949d494edf8864a2bd13918f3 (patch) | |
| tree | 3dad54a0a1e46455e66a424e74b7d452ed606cb6 /src | |
| parent | 61cdadf5bc211749002508b0597bb1239024f0d4 (diff) | |
| download | emacs-d2255c6065b0bc3949d494edf8864a2bd13918f3.tar.gz emacs-d2255c6065b0bc3949d494edf8864a2bd13918f3.zip | |
Fix $(MAKE) -C for out-of-tree bootstraps
Problem reported by Andy Moreton in:
https://lists.gnu.org/r/emacs-devel/2019-04/msg00359.html
* src/Makefile.in (${charsets}, $(lispsource)/loaddefs.el):
Revert incorrect changes to $(MAKE) -C invocations when the
target is in the source tree not the build tree.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f8a2ffadc27..6d6308fde6d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -533,7 +533,7 @@ ${lispintdir}/cp51932.el ${lispintdir}/eucjp-ms.el: FORCE | |||
| 533 | 533 | ||
| 534 | charsets = ${top_srcdir}/admin/charsets/charsets.stamp | 534 | charsets = ${top_srcdir}/admin/charsets/charsets.stamp |
| 535 | ${charsets}: FORCE | 535 | ${charsets}: FORCE |
| 536 | $(MAKE) -C $(dir $@) all | 536 | $(MAKE) -C ../admin/charsets all |
| 537 | 537 | ||
| 538 | charscript = ${lispintdir}/charscript.el | 538 | charscript = ${lispintdir}/charscript.el |
| 539 | ${charscript}: FORCE | 539 | ${charscript}: FORCE |
| @@ -765,7 +765,7 @@ VCSWITNESS = | |||
| 765 | 765 | ||
| 766 | $(lispsource)/loaddefs.el: $(VCSWITNESS) | \ | 766 | $(lispsource)/loaddefs.el: $(VCSWITNESS) | \ |
| 767 | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) | 767 | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) |
| 768 | $(MAKE) -C $(dir $@) autoloads EMACS="$(bootstrap_exe)" | 768 | $(MAKE) -C ../lisp autoloads EMACS="$(bootstrap_exe)" |
| 769 | 769 | ||
| 770 | ## Dump an Emacs executable named bootstrap-emacs containing the | 770 | ## Dump an Emacs executable named bootstrap-emacs containing the |
| 771 | ## files from loadup.el in source form. | 771 | ## files from loadup.el in source form. |