Mercurial > emacs
changeset 104553:86a609c04ee2
(bootstrap_exe): New variable.
(.el.elc, ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}):
Use ${bootstrap_exe}.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 22 Aug 2009 22:16:58 +0000 |
| parents | 10c38084881d |
| children | fd66344736c6 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 22 21:59:40 2009 +0000 +++ b/src/ChangeLog Sat Aug 22 22:16:58 2009 +0000 @@ -1,3 +1,9 @@ +2009-08-22 Glenn Morris <rgm@gnu.org> + + * Makefile.in (bootstrap_exe): New variable. + (.el.elc, ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}): + Use ${bootstrap_exe}. + 2009-08-22 Eli Zaretskii <eliz@gnu.org> * coding.h (encode_coding_string): Don't encode unibyte strings.
--- a/src/Makefile.in Sat Aug 22 21:59:40 2009 +0000 +++ b/src/Makefile.in Sat Aug 22 22:16:58 2009 +0000 @@ -63,6 +63,8 @@ S_FILE = ${srcdir}/@opsysfile@ config_h = config.h $(M_FILE) $(S_FILE) +bootstrap_exe = ../src/bootstrap-emacs${EXEEXT} + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -1361,13 +1363,13 @@ With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" */ .el.elc: @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ - THEFILE=$< EMACS=../src/bootstrap-emacs${EXEEXT} + THEFILE=$< EMACS=${bootstrap_exe} /* 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=../src/bootstrap-emacs${EXEEXT} + cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe} /* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ @@ -1381,4 +1383,4 @@ 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=../src/bootstrap-emacs${EXEEXT} + cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}