From 9c6b7f760a17ef7fc55eac298e8778809ccc868e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 25 Jun 2008 20:04:35 +0200
Subject: Use variable for selftest directory. (This used to be commit
 78760606fa71c370ae3c05b077c5146166bdaa7b)

---
 source4/Makefile           | 3 ++-
 source4/selftest/config.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4')

diff --git a/source4/Makefile b/source4/Makefile
index 1889ba2d5e..8a8eef7b4d 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -290,7 +290,8 @@ data.mk: config.status $(MK_FILES)
 testcov-html:: 
 
 include $(pidldir)/config.mk
-include $(srcdir)/selftest/config.mk
+selftestdir := $(srcdir)/selftest
+include $(selftestdir)/config.mk
 
 showflags::
 	@echo '  pwd        = '`/bin/pwd`
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 2ae49b244b..871c14898f 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -1,6 +1,6 @@
 TEST_FORMAT = plain
 
-SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/samba4-knownfail \
 	--format=$(TEST_FORMAT) \
-- 
cgit