elisp: prefer $(builddir) files over $(srcdir) ones

* lib/am/lisp.am (.el.elc): Here.  This better respects VPATH spirit.
Adjust and extends comments.
* t/list-of-tests.mk (XFAIL_TESTS): Remove 't/lisp-loadpath.sh', which
now passes.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 0d355f5..ce87fb0 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -25,13 +25,14 @@ endif %?INSTALL%
 .el.elc:
 ## We add $(abs_builddir) and $(abs_srcdir) to load-path, so that any
 ## .el files that $< depends upon can be found (including generated
-## ones). The destination file is normally determined by appending "c"
-## to the input (which would put it in $(srcdir)), so we override
-## that, too.
+## ones). Prefer files from the build directory to those from the source
+## directory, in true VPATH spirit.  The destination file is normally
+## determined by appending "c" to the input (which would erronously put
+## it in $(srcdir) in VPATH builds), so we override that, too.
        if test "$(EMACS)" != "no"; then \
          $(EMACS) -q --batch \
-           --eval "(setq load-path (cons \"$(abs_builddir)\" load-path))" \
            --eval "(setq load-path (cons \"$(abs_srcdir)\" load-path))" \
+           --eval "(setq load-path (cons \"$(abs_builddir)\" load-path))" \
            --eval "(defun byte-compile-dest-file (f) \"$@\")" \
            --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
        else :; fi

diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 0f7bae0..c7d0fad 100644 (file)
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -38,7 +38,6 @@ t/override-conditional-2.sh \
 t/dist-pr109765.sh \
 t/instdir-cond2.sh \
 t/java-nobase.sh \
-t/lisp-loadpath.sh \
 t/lisp-subdir.sh \
 t/lisp-subdir2.sh \
 t/objext-pr10128.sh \