diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-16 14:35:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-16 14:35:57 -0800 |
| commit | 8fb8c4f3735ac3b1b61bd3472a7ba2ad35d1dad5 (patch) | |
| tree | c4161b9d215d18f6b810c7b36a25864ad507df44 /leim | |
| parent | 6c8e0ae69b3488e4ff38527cc930202e9cd9a98e (diff) | |
Fix problems with CANNOT_DUMP and EMACSLOADPATH.
* leim/Makefile.in (RUN_EMACS):
* lisp/Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
* lisp/loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
Expand dir too, in case it's relative.
* src/lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 5 | ||||
| -rw-r--r-- | leim/Makefile.in | 4 |
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@ |