aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--performance-test/Makefile.local2
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 73a85546..0428160b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@
# given explicitly on the command line) so mention it first.
all:
-# List all subdirectories here. Each contains its own Makefile.local
-subdirs := compat completion emacs lib man parse-time-string
-subdirs += performance-test util test
+# List all subdirectories here. Each contains its own Makefile.local.
+# Use of '=', without '+=', seems to be required for out-of-tree
+# builds to work.
+subdirs = compat completion emacs lib man parse-time-string performance-test util test
# We make all targets depend on the Makefiles themselves.
global_deps = Makefile Makefile.config Makefile.local \
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 73aa963b..e47219ad 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -2,7 +2,7 @@
dir := performance-test
-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh
TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test