diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 15:55:58 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 15:55:58 -0700 |
commit | 271e61eb60721546bf373531852a88f14b840d12 (patch) | |
tree | 617ada4d9e26a7d255d8c792165b40214c65ddb3 /src/Makefile.in | |
parent | c6046b94e58b33ddcfca8f6361ddaf780ba5cb18 (diff) | |
parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
download | emacs-271e61eb60721546bf373531852a88f14b840d12.tar.gz |
Merge from trunk.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r-- | src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 19f586396cb..9525996caea 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -396,7 +396,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 |