summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-12-09 07:51:43 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-12-09 07:51:43 -0800
commiteda6efa892a9a45c3983ed9d6eae83cc72a52705 (patch)
treee1a12f7cc11b73156a4cd234e7ddcb2845add72f /Makefile
parent4a0c38359c0320d66ec6b1f04244b5ed4ba39a27 (diff)
downloadtxr-eda6efa892a9a45c3983ed9d6eae83cc72a52705.tar.gz
txr-eda6efa892a9a45c3983ed9d6eae83cc72a52705.tar.bz2
txr-eda6efa892a9a45c3983ed9d6eae83cc72a52705.zip
* 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).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
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)