Do satyr work against a copy of the build farm scripts so as not to

break them.

installcheck has to find smbd in SBINDIR, not BINDIR.
(This used to be commit 1be6139e148d752ec3619468ee1cca7f61ee16e1)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6692e3c811fa5a93c81384abeaf73a4f28aa01dc..bc6517ebc261c6d587893b3cef00e50825866229 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -859,7 +859,7 @@ dangerous-installcheck:
        mkdir -p $(BASEDIR)/var
        PATH=$(BINDIR):$(SBINDIR):$(PATH) \
        SATYR_DISCOURAGE=1 \
-       SATYR_SUITEDIR=../testsuite/build_farm/ prefix=$(BASEDIR) \
-       LIBSMB_PROG=$(BINDIR)/smbd \
+       SATYR_SUITEDIR=../testsuite/satyr/ prefix=$(BASEDIR) \
+       LIBSMB_PROG=$(SBINDIR)/smbd \
        testdir=./testdir $(SHELL) satyr