Mercurial > emacs
changeset 107450:8da5b7ca4663
Expand ${bootstrap_exe} before chdir
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sun, 21 Mar 2010 12:27:46 +0100 |
| parents | e64817c0ab40 |
| children | d8347f5058b6 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Mar 21 12:52:51 2010 +0200 +++ b/src/ChangeLog Sun Mar 21 12:27:46 2010 +0100 @@ -1,3 +1,9 @@ +2010-03-21 Andreas Schwab <schwab@linux-m68k.org> + + * Makefile.in (.el.elc): Expand ${bootstrap_exe} before chdir. + (${lispsource}loaddefs.el): Likewise. + (bootstrap-emacs${EXEEXT}): Likewise. + 2010-03-20 Stefan Monnier <monnier@iro.umontreal.ca> * Makefile.in (bootstrap_exe): Use an absolute name.
--- a/src/Makefile.in Sun Mar 21 12:52:51 2010 +0200 +++ b/src/Makefile.in Sun Mar 21 12:27:46 2010 +0100 @@ -1332,14 +1332,15 @@ 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 @@ 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