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 /lisp/Makefile.in | |
| parent | 6c8e0ae69b3488e4ff38527cc930202e9cd9a98e (diff) | |
| download | emacs-8fb8c4f3735ac3b1b61bd3472a7ba2ad35d1dad5.tar.gz | |
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 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 0cc22839f99..2ac2f3e8d6b 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -105,8 +105,7 @@ COMPILE_FIRST = \ $(lisp)/emacs-lisp/autoload.elc # The actual Emacs command run in the targets below. -# Prevent any setting of EMACSLOADPATH in user environment causing problems. -emacs = EMACSLOADPATH= "$(EMACS)" $(EMACSOPT) +emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT) # Common command to find subdirectories setwins=for file in `find . -type d -print`; do \ |