diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-03 17:48:08 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-03 17:48:08 -0800 |
| commit | 8b77446f3f4e49780e29cd936211eeee1453ca6c (patch) | |
| tree | 70833273df45f7eb4bda13c28b3f28c10ce771e8 /test/automated/Makefile.in | |
| parent | 6dc6d301796849936993ba5827dc9fe156647b64 (diff) | |
* test/automated/Makefile.in (abs_srcdir): Remove.
(emacs): Unset EMACSLOADPATH.
(.el.elc, check): Use -L to append srcdir to load-path.
Diffstat (limited to 'test/automated/Makefile.in')
| -rw-r--r-- | test/automated/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index 7ddade8dad..e03ebbbf82 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -20,7 +20,6 @@ SHELL = @SHELL@ srcdir = @srcdir@ -abs_srcdir = @abs_srcdir@ VPATH = $(srcdir) # We never change directory before running Emacs, so a relative file @@ -35,7 +34,8 @@ EMACSOPT = -batch --no-site-file --no-site-lisp BYTE_COMPILE_EXTRA_FLAGS = # The actual Emacs command run in the targets below. -emacs = EMACSLOADPATH="$(abs_srcdir)/../../lisp:$(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`; \ @@ -55,7 +55,7 @@ all: check .el.elc: @echo Compiling $< - @$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $< + @$(emacs) -L :$(srcdir) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $< .PHONY: compile-targets compile-main compile-clean @@ -110,6 +110,6 @@ check: compile-main done; \ echo Testing $$els; \ cd "$$thisdir"; \ - $(emacs) --chdir $(srcdir) $$args -f ert-run-tests-batch-and-exit + $(emacs) --chdir $(srcdir) -L :. $$args -f ert-run-tests-batch-and-exit # Makefile ends here. |