emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master d2255c6: Fix $(MAKE) -C for out-of-tree bootstraps


From: Paul Eggert
Subject: [Emacs-diffs] master d2255c6: Fix $(MAKE) -C for out-of-tree bootstraps
Date: Wed, 10 Apr 2019 13:06:58 -0400 (EDT)

branch: master
commit d2255c6065b0bc3949d494edf8864a2bd13918f3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index f8a2ffa..6d6308f 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]