X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=stest%2FMakefile.in;h=0979618cd81294f94d04566f05d9931e442d35ba;hb=0758288d453c0f52f9496ecd7937ea8b526c9080;hp=f9850594d74707357fb106351d46b03c69a55bf9;hpb=6e553442518e7cd93e779d2895cb4c26ba5ba793;p=secnet.git

diff --git a/stest/Makefile.in b/stest/Makefile.in
index f985059..0979618 100644
--- a/stest/Makefile.in
+++ b/stest/Makefile.in
@@ -1,9 +1,13 @@
 
-CC:=@CC@
+VPATH:=@srcdir@
+srcdir:=@srcdir@
+topdir:=@top_srcdir@
+
+include ../common.make
 
 TARGETS=udp-preload.so check
 
-TESTSCRIPTS ?= $(shell echo t-*[0-9a-z])
+TESTSCRIPTS ?= $(shell echo $(srcdir)/t-*[0-9a-z])
 TESTNAMES := $(patsubst t-%,%,$(notdir $(TESTSCRIPTS)))
 
 all: $(TARGETS)
@@ -33,9 +37,11 @@ check:
 
 check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
 
-d-%/ok: t-% udp-preload.so common.tcl ../secnet ../test-example/sites.conf
+d-%/ok: $(srcdir)/t-% udp-preload.so $(srcdir)/common.tcl \
+		../secnet ../test-example/sites.conf
 	@rm -rf d-$*; mkdir d-$*
-	@cd .. && stest/$< >stest/d-$*/log 2>&1
+	export STEST_BUILDDIR=$(topbuilddir); \
+	cd $(topdir) && stest/t-$* >$(topbuilddir)/stest/d-$*/log 2>&1
 	@printf "$* "
 	@touch $@