summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-04-10 10:06:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-04-10 10:06:53 -0700
commitd2255c6065b0bc3949d494edf8864a2bd13918f3 (patch)
tree3dad54a0a1e46455e66a424e74b7d452ed606cb6
parent61cdadf5bc211749002508b0597bb1239024f0d4 (diff)
downloademacs-d2255c6065b0bc3949d494edf8864a2bd13918f3.tar.gz
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.
-rw-r--r--src/Makefile.in4
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
charsets = ${top_srcdir}/admin/charsets/charsets.stamp
${charsets}: FORCE
- $(MAKE) -C $(dir $@) all
+ $(MAKE) -C ../admin/charsets all
charscript = ${lispintdir}/charscript.el
${charscript}: FORCE
@@ -765,7 +765,7 @@ VCSWITNESS =
$(lispsource)/loaddefs.el: $(VCSWITNESS) | \
bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
- $(MAKE) -C $(dir $@) autoloads EMACS="$(bootstrap_exe)"
+ $(MAKE) -C ../lisp autoloads EMACS="$(bootstrap_exe)"
## Dump an Emacs executable named bootstrap-emacs containing the
## files from loadup.el in source form.