Rename leim/Makefile's BUILT_EMACS to EMACS

* leim/Makefile.in (EMACS): Rename from BUILT_EMACS.
(RUN_EMACS, compile-main): Update for this change.

* src/Makefile.in ($(leimdir)/leim-list.el):
Pass EMACS rather than BUILT_EMACS.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f7889d99335..aa7d3b5eb7f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(leimdir)/leim-list.el):
+        Pass EMACS rather than BUILT_EMACS.
+
 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * process.c (make_process):
diff --git a/src/Makefile.in b/src/Makefile.in
index 8c3704f830e..a90fd5841e4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -395,7 +395,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
 all: emacs$(EXEEXT) $(OTHER_FILES)
 
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
-        cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe)
+        cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
 
 ## Does anyone ever pay attention to the load-path-shadows output here?
 ## The dumped Emacs is as functional and more efficient than