diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97e00691798..7930c7d5eda 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-03 Glenn Morris <rgm@gnu.org> + + * Makefile.in (abs_srcdir): Remove. + (emacs): Unset EMACSLOADPATH. + 2013-11-02 Glenn Morris <rgm@gnu.org> * Makefile.in (EMACS): Use a relative filename. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 8bf1b33c215..7b0206a623d 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -20,7 +20,6 @@ SHELL = @SHELL@ srcdir = @srcdir@ -abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ lisp = $(srcdir) VPATH = $(srcdir) @@ -106,8 +105,8 @@ COMPILE_FIRST = \ $(lisp)/emacs-lisp/autoload.elc # The actual Emacs command run in the targets below. - -emacs = EMACSLOADPATH="$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT) +# Prevent any setting of EMACSLOADPATH in user environment causing problems. +emacs = unset EMACSLOADPATH; LC_ALL=C "$(EMACS)" $(EMACSOPT) # Common command to find subdirectories setwins=subdirs=`find . -type d -print`; \ |