From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 10 Apr 2019 17:06:21 +0000 (-0700)
Subject: Fix $(MAKE) -C for out-of-tree bootstraps
X-Git-Tag: emacs-27.0.90~3261^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2255c6065b0bc3949d494edf8864a2bd13918f3;p=emacs.git

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.
---

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.