summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ea24ad7d..2b50a298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2014-12-09 Kaz Kylheku <kaz@kylheku.com>
+ * Makefile (($TESTS_OUT)): Do not depend on $(PROG).
+ This adds superfluous commands to run.sh under make install-tests,
+ and is also inappropriate if a different txr binary is being tested.
+ (install-tests): Do not override top_srcdir in the recursive make
+ call; instead use -C to change to $(top_srcdir).
+
+2014-12-09 Kaz Kylheku <kaz@kylheku.com>
+
* Makefile (all): Mark as phony target.
2014-12-09 Kaz Kylheku <kaz@kylheku.com>
diff --git a/Makefile b/Makefile
index e89f3ecb..cf422c2d 100644
--- a/Makefile
+++ b/Makefile
@@ -156,8 +156,6 @@ TESTS_OUT := $(patsubst $(top_srcdir)/%.txr,./%.out,\
$(shell find $(top_srcdir)/tests -name '*.txr' | sort))
TESTS_OK := $(TESTS_OUT:.out=.ok)
-$(TESTS_OUT): $(PROG)
-
.PHONY: tests
tests: $(TESTS_OK)
$(V)echo "** tests passed!"
@@ -279,7 +277,7 @@ install-tests:
$(V)(echo "#!/bin/sh" ; \
echo "set -ex" ; \
echo "cd $(datadir)" ; \
- make -s -n tests VERBOSE=y top_srcdir=. TXR=$(bindir)/txr) \
+ make -C $(top_srcdir) -s -n tests VERBOSE=y TXR=$(bindir)/txr) \
> run.sh
$(call INSTALL,0755,run.sh,$(DESTDIR)$(datadir)/tests)