[Emacs-diffs] trunk r114930: * test/automated/Makefile.in (abs_srcdir): Remove.

[Glenn Morris]

------------------------------------------------------------
revno: 114930
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-03 17:48:08 -0800
message:
  * test/automated/Makefile.in (abs_srcdir): Remove.
  (emacs): Unset EMACSLOADPATH.
  (.el.elc, check): Use -L to append srcdir to load-path.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-02 20:54:08 +0000
+++ b/test/ChangeLog    2013-11-04 01:48:08 +0000
@@ -1,3 +1,9 @@
+2013-11-04  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-02 20:54:08 +0000
+++ b/test/automated/Makefile.in        2013-11-04 01:48:08 +0000
@@ -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 @@
 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 @@
 
 .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 @@
        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.