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.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index e71017e83703e89c07103fff6ed7fe5b5586edd6..9883995c68bed446730ac3ca36b99d42d64c3888 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-03  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_srcdir): Remove.
+       (RUN_EMACS): Unset EMACSLOADPATH.
+
 2013-11-02  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (buildlisppath): Remove.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 35111ae0229d995ef92c0988490b87d07a5e88fe..c1a79a75d0498976666e3f07384fa01c79899507 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -25,15 +25,15 @@ SHELL = @SHELL@
 
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
-abs_srcdir=@abs_srcdir@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
 EMACS = ../src/emacs
 
 # How to run Emacs.
-RUN_EMACS = EMACSLOADPATH="${abs_srcdir}/../lisp" LC_ALL=C \
-       "${EMACS}" -batch --no-site-file --no-site-lisp
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+RUN_EMACS = unset EMACSLOADPATH; LC_ALL=C "${EMACS}" -batch \
+       --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97e0069179871ac85db2a228f2bb80a67d97df5f..7930c7d5eda1e67be74eebb9c26e231e152ea2d5 100644 (file)
--- 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 8bf1b33c2158460e1eed8309be32a47ce29ff86c..7b0206a623d27f5446b71d128fe86207921457c9 100644 (file)
--- 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`; \