From c0282183ba4a5b62292627a51726426479bf4272 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 21 Mar 2010 12:27:46 +0100 Subject: [PATCH] Expand ${bootstrap_exe} before chdir --- src/ChangeLog | 6 ++++++ src/Makefile.in | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1f8be957599..80e10e2434f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-03-21 Andreas Schwab + + * Makefile.in (.el.elc): Expand ${bootstrap_exe} before chdir. + (${lispsource}loaddefs.el): Likewise. + (bootstrap-emacs${EXEEXT}): Likewise. + 2010-03-20 Stefan Monnier * Makefile.in (bootstrap_exe): Use an absolute name. diff --git a/src/Makefile.in b/src/Makefile.in index 389b7921d6e..6b502f39207 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1332,14 +1332,15 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS separately below. With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" */ .el.elc: - @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ - THEFILE=$< EMACS=${bootstrap_exe} + @EMACS=${bootstrap_exe}; \ + cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile THEFILE=$< EMACS=$$EMACS /* Since the .el.elc rule cannot specify an extra dependency, we do it here. */ ${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS) ${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) - cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe} + EMACS=${bootstrap_exe}; \ + cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$$EMACS /* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ @@ -1353,7 +1354,8 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ @: Compile some files earlier to speed up further compilation. - cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe} + EMACS=${bootstrap_exe}; \ + cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=$$EMACS #ifdef AUTO_DEPEND ALLOBJS=$(STARTFILES) ${obj} ${otherobj} prefix-args.o -- 2.39.2