* test/automated/Makefile.in (abs_srcdir): Remove.

(emacs): Unset EMACSLOADPATH.
(.el.elc, check): Use -L to append srcdir to load-path.

diff --git a/test/ChangeLog b/test/ChangeLog
index 6d00a61aeedf0ac6363ba991a8e2b52e24677677..1439ee12bb4a94318b7cff8077fc6d852481cf8e 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-04  Glenn Morris  <rgm@gnu.org>
+
+       * automated/Makefile.in (abs_srcdir): Remove.
+       (emacs): Unset EMACSLOADPATH.
+       (.el.elc, check): Use -L to append srcdir to load-path.
+
 2013-11-02  Glenn Morris  <rgm@gnu.org>
 
        * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 7ddade8dadc6c3e8b5d135ab44476161f890efa1..e03ebbbf82de91f796f3d453263287dd38a2586c 100644 (file)
--- 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.