From 0714e23971f701999f69ed85c65e4f3f33153a97 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 20 Jun 2010 17:46:39 +0200 Subject: provision: Look for Samba prefix a bit harder. --- source4/scripting/python/samba/provision.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 804bbe78ea..cfba780baf 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") -- cgit