summaryrefslogtreecommitdiff
path: root/lisp/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-11-03 11:25:29 -0800
committerGlenn Morris <rgm@gnu.org>2013-11-03 11:25:29 -0800
commit62942f895f177dea7ada3f1fbccbaa9ad814ae38 (patch)
tree567b7c3bbaf4e639391d918676884a0f7dbebc25 /lisp/Makefile.in
parentfca2fccbea4f4b53da3f5110781439e98ae5a2eb (diff)
Unset EMACSLOADPATH in some Makefiles rather than setting it to the default
* leim/Makefile.in (abs_srcdir): Remove. (RUN_EMACS): Unset EMACSLOADPATH. * lisp/Makefile.in (abs_srcdir): Remove. (emacs): Unset EMACSLOADPATH.
Diffstat (limited to 'lisp/Makefile.in')
-rw-r--r--lisp/Makefile.in5
1 files changed, 2 insertions, 3 deletions
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`; \