summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-03-02 10:58:50 +1100
committerAndrew Bartlett <abartlet@samba.org>2013-03-02 02:16:52 +0100
commit80fce353e740c793619005ac102ab07fb5e7d280 (patch)
treeae2c099e4d90f6968b0fc21e6c0506d91510e90c
parent2d13532cb3ad3a3deaee1f158408478284bc595a (diff)
downloadsamba-80fce353e740c793619005ac102ab07fb5e7d280.tar.gz
samba-80fce353e740c793619005ac102ab07fb5e7d280.tar.bz2
samba-80fce353e740c793619005ac102ab07fb5e7d280.zip
build: Change bin/default/python -> bin/python symlink to bin/default/python_modules
This avoids a collision with the new top level python directory. Andrew Bartlett
-rw-r--r--buildtools/wafsamba/samba_python.py2
-rw-r--r--buildtools/wafsamba/wafsamba.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 6bc32f00b6..b2172f71a1 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -35,7 +35,7 @@ def SAMBA_PYTHON(bld, name,
source = bld.EXPAND_VARIABLES(source, vars=vars)
if realname is not None:
- link_name = 'python/%s' % realname
+ link_name = 'python_modules/%s' % realname
else:
link_name = None
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index dcbb04704a..f7156ecf7f 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -64,10 +64,10 @@ def SAMBA_BUILD_ENV(conf):
# this allows all of the bin/shared and bin/python targets
# to be expressed in terms of build directory paths
mkdir_p(os.path.join(conf.blddir, 'default'))
- for p in ['python','shared', 'modules']:
- link_target = os.path.join(conf.blddir, 'default/' + p)
+ for (source, target) in [('shared', 'shared'), ('modules', 'modules'), ('python', 'python_modules')]:
+ link_target = os.path.join(conf.blddir, 'default/' + target)
if not os.path.lexists(link_target):
- os.symlink('../' + p, link_target)
+ os.symlink('../' + source, link_target)
# get perl to put the blib files in the build directory
blib_bld = os.path.join(conf.blddir, 'default/pidl/blib')