From 7763401bac994e1c6bf94cba3b2a445927df40cd Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 22 Aug 2009 22:16:58 +0000
Subject: [PATCH] (bootstrap_exe): New variable. (.el.elc,
 ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}): Use ${bootstrap_exe}.

---
 src/ChangeLog   | 6 ++++++
 src/Makefile.in | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 548f1c3dc4..0859ccb5bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index 425cf98f92..8ee2f6c4ff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,6 +63,8 @@ M_FILE = ${srcdir}/@machfile@
 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 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS
    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 @@ 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=../src/bootstrap-emacs${EXEEXT}
+	cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}
-- 
2.39.2