From: Stefano Lattarini Date: Sat, 14 Jul 2012 20:33:40 +0000 (+0200) Subject: elisp: prefer $(builddir) files over $(srcdir) ones X-Git-Tag: v1.12b~64^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd72e5d9283fcd778e7d694d3a420b934e842d3;p=thirdparty%2Fautomake.git 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 --- diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 0d355f54e..ce87fb02f 100644 --- 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 0f7bae0ae..c7d0fad62 100644 --- 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 \