The branch, master has been updated via 0714e23... provision: Look for Samba prefix a bit harder. from a875616... Revert "s4:ldb-samba: fix the build without a system ldb"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0714e23971f701999f69ed85c65e4f3f33153a97 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Jun 20 17:46:39 2010 +0200 provision: Look for Samba prefix a bit harder. ----------------------------------------------------------------------- Summary of changes: source4/scripting/python/samba/provision.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 804bbe7..cfba780 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -66,10 +66,12 @@ __docformat__ = "restructuredText" def find_setup_dir(): """Find the setup directory used by provision.""" import sys - for suffix in ["share/setup", "share/samba/setup", "setup"]: - ret = os.path.join(sys.prefix, suffix) - if os.path.isdir(ret): - return ret + for prefix in [sys.prefix, + os.path.join(os.path.dirname(__file__), "../../../..")]: + for suffix in ["share/setup", "share/samba/setup", "setup"]: + ret = os.path.join(prefix, suffix) + if os.path.isdir(ret): + return ret # In source tree dirname = os.path.dirname(__file__) ret = os.path.join(dirname, "../../../setup") -- Samba Shared Repository