Commit c0282183 authored by Andreas Schwab's avatar Andreas Schwab

Expand ${bootstrap_exe} before chdir

parent d66ecdbb
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.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment