[Emacs-diffs] /srv/bzr/emacs/trunk r99711: Expand ${bootstrap_exe} before chdir

[Andreas Schwab]

------------------------------------------------------------
revno: 99711
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2010-03-21 12:27:46 +0100
message:
  Expand ${bootstrap_exe} before chdir
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-20 21:46:31 +0000
+++ b/src/ChangeLog     2010-03-21 11:27:46 +0000
@@ -1,3 +1,9 @@
+2010-03-21  Andreas Schwab  <address@hidden>
+
+       * Makefile.in (.el.elc): Expand ${bootstrap_exe} before chdir.
+       (${lispsource}loaddefs.el): Likewise.
+       (bootstrap-emacs${EXEEXT}): Likewise.
+
 2010-03-20  Stefan Monnier  <address@hidden>
 
        * Makefile.in (bootstrap_exe): Use an absolute name.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-03-20 21:46:31 +0000
+++ b/src/Makefile.in   2010-03-21 11:27:46 +0000
@@ -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