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.
This commit is contained in:
Glenn Morris 2013-11-03 11:25:29 -08:00
parent fca2fccbea
commit 62942f895f
4 changed files with 15 additions and 6 deletions

View file

@ -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.

View file

@ -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@

View file

@ -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.

View file

@ -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`; \