diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-03 11:25:29 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-03 11:25:29 -0800 |
| commit | 62942f895f177dea7ada3f1fbccbaa9ad814ae38 (patch) | |
| tree | 567b7c3bbaf4e639391d918676884a0f7dbebc25 | |
| parent | fca2fccbea4f4b53da3f5110781439e98ae5a2eb (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.
| -rw-r--r-- | leim/ChangeLog | 5 | ||||
| -rw-r--r-- | leim/Makefile.in | 6 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index e71017e837..9883995c68 100644 --- 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 35111ae022..c1a79a75d0 100644 --- 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 97e0069179..7930c7d5ed 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 8bf1b33c21..7b0206a623 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`; \ |