summaryrefslogtreecommitdiff
path: root/leim
diff options
context:
space:
mode:
Diffstat (limited to 'leim')
-rw-r--r--leim/ChangeLog5
-rw-r--r--leim/Makefile.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 31b9c37690..fa1612ab03 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16 Paul Eggert <eggert@cs.ucla.edu>
+
+ Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+ * Makefile.in (RUN_EMACS): Add lisp src to EMACSLOADPATH.
+
2013-11-28 Glenn Morris <rgm@gnu.org>
* Makefile.in (${leimdir}/leim-list.el):
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 383c521504..33d68b797d 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim
EMACS = ../src/emacs
# How to run Emacs.
-# Prevent any setting of EMACSLOADPATH in user environment causing problems.
-RUN_EMACS = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
+RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \
+ -batch --no-site-file --no-site-lisp
MKDIR_P = @MKDIR_P@