summaryrefslogtreecommitdiff
path: root/source4/Makefile
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-19 10:45:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-19 10:45:25 +0200
commit2c8cf0b394e8625017a1290f73d0007d3b5b6d20 (patch)
tree9d63288e05bbc7b8d8f75b8373884ce7613ba305 /source4/Makefile
parentc484b0465c8c2298c8d439677412f34e6bdd17f1 (diff)
parent694a579cb8d418a4feb441a77c0dc000023f2c6e (diff)
downloadsamba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.tar.gz
samba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.tar.bz2
samba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
Diffstat (limited to 'source4/Makefile')
-rw-r--r--source4/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 7dae4729b7..26cab668c8 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -301,8 +301,8 @@ data.mk: config.status $(MK_FILES)
testcov-html::
include $(pidldir)/config.mk
-selftestdir := $(srcdir)/selftest
-include $(selftestdir)/config.mk
+selftestdir := $(srcdir)/../selftest
+include $(srcdir)/selftest/config.mk
showflags::
@echo ' pwd = '`/bin/pwd`