diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-09 16:37:08 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-09 16:37:08 -0400 |
| commit | 935396c0f0f97df05f0e41af517abed22655fd20 (patch) | |
| tree | 4cf7146c001b2f87f40531a2aa66cb8d7264558c /leim | |
| parent | e98e405ed50a82bf1223b47f7ef4be324e4cd66b (diff) | |
| download | emacs-935396c0f0f97df05f0e41af517abed22655fd20.tar.gz | |
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.
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 3 | ||||
| -rw-r--r-- | leim/Makefile.in | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index fecefbd14e5..07e26cf766b 100644 --- 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 bbae652b3e6..21561a357d1 100644 --- 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 |