aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in2
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 @@
12012-04-09 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(leimdir)/leim-list.el):
4 Pass EMACS rather than BUILT_EMACS.
5
12012-04-09 Teodor Zlatanov <tzz@lifelogs.com> 62012-04-09 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * process.c (make_process): 8 * 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) \
395all: emacs$(EXEEXT) $(OTHER_FILES) 395all: emacs$(EXEEXT) $(OTHER_FILES)
396 396
397$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 397$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
398 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe) 398 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
399 399
400## Does anyone ever pay attention to the load-path-shadows output here? 400## Does anyone ever pay attention to the load-path-shadows output here?
401## The dumped Emacs is as functional and more efficient than 401## The dumped Emacs is as functional and more efficient than