[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] elisp: prefer $(builddir) files over $(srcdir) ones
From: |
Stefano Lattarini |
Subject: |
[PATCH 4/7] elisp: prefer $(builddir) files over $(srcdir) ones |
Date: |
Sat, 14 Jul 2012 23:51:58 +0200 |
* 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 <address@hidden>
---
lib/am/lisp.am | 9 +++++----
t/list-of-tests.mk | 1 -
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 0d355f5..ce87fb0 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) \"address@hidden")" \
--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
--- 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 \
--
1.7.9.5
- Refactoring elisp compilation, Jack Kelly, 2012/07/14
- Re: Refactoring elisp compilation, Stefano Lattarini, 2012/07/14
- [PATCH 0/7] More work on elisp support, Stefano Lattarini, 2012/07/14
- [PATCH 1/7] coverage: emacs lisp files in subdirectories, Stefano Lattarini, 2012/07/14
- [PATCH 2/7] coverage: elisp path contains $(srcdir) and $(builddir), Stefano Lattarini, 2012/07/14
- [PATCH 3/7] elisp: use suffix rules, get rid of 'elisp-comp' script (mostly a rewrite), Stefano Lattarini, 2012/07/14
- [PATCH 4/7] elisp: prefer $(builddir) files over $(srcdir) ones,
Stefano Lattarini <=
- [PATCH 5/7] elisp: no need to "absolutize" $(srcdir) and $(builddir) ..., Stefano Lattarini, 2012/07/14
- Re: [PATCH 5/7] elisp: no need to "absolutize" $(srcdir) and $(builddir) ..., Jack Kelly, 2012/07/14
- Re: [PATCH 5/7] elisp: no need to "absolutize" $(srcdir) and $(builddir) ..., Stefano Lattarini, 2012/07/15
- [PATCH 7/7] elisp: support elisp files in subdirectories properly, Stefano Lattarini, 2012/07/14
- [PATCH 6/7] elisp: simplify suffix rules using emacs '-L' option, Stefano Lattarini, 2012/07/14
- Re: Refactoring elisp compilation, Jack Kelly, 2012/07/14