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.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index fecefbd14e52da44c5f8585936e97ce6cc40ec01..07e26cf766b538540a7b9021018ac9109d54b235 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-09  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (EMACS): Rename from BUILT_EMACS.
+       (RUN_EMACS, compile-main): Update for this change.
+
        * Makefile.in (../src/emacs): Remove this rule, no longer relevant
        since leim distributed with Emacs (eg lisp/ has no such rule).
        (all): Remove $BUILT_EMACS dependence.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index bbae652b3e68b91ee609385ad68d945d8a567457..21561a357d154b94586844f8bcd7891048d1f802 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -41,13 +41,13 @@ GZIP_PROG = @GZIP_PROG@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
-BUILT_EMACS = ../src/emacs
+EMACS = ../src/emacs
 
 buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
 RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
-       ${BUILT_EMACS} -batch --no-site-file --no-site-lisp
+       ${EMACS} -batch --no-site-file --no-site-lisp
 
 # Subdirectories to be made if ${srcdir} is different from the current
 # directory.
@@ -171,7 +171,7 @@ compile-main: ${TIT_MISC}
          echo "$${el}c"; \
        done | xargs echo) | \
        while read chunk; do \
-         $(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)" TARGETS="$$chunk"; \
+         $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
        done
 
 MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done

diff --git a/src/ChangeLog b/src/ChangeLog
index f7889d99335e33a2cec9652666947af4d21c2ada..aa7d3b5eb7f0570ede561fa2766b8f1db5148373 100644 (file)
--- 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 8c3704f830e35f44d2c062a0f4706b4005c7e1ce..a90fd5841e4ede81a7de23452d5dce2b42cc2fc4 100644 (file)
--- 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