summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-01 16:36:10 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-02 15:21:13 +1100
commita3e99356abab3fd77a87d2ac594243b3f77e3cdd (patch)
treededc3cc9436b0b8cef4d5b4a8aa25371aebc4f3d /source4
parentdbe0b078492ea20da2b0aa3bb1d1c6138d16454e (diff)
downloadsamba-a3e99356abab3fd77a87d2ac594243b3f77e3cdd.tar.gz
samba-a3e99356abab3fd77a87d2ac594243b3f77e3cdd.tar.bz2
samba-a3e99356abab3fd77a87d2ac594243b3f77e3cdd.zip
s4-waf Don't install any Samba packages into PYTHONDIR
This causes the parts of Samba installed into PYTHONARCHDIR to then be missed in mixed python/C module namespaces. Andrew Bartlett
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/librpc/wscript_build2
-rw-r--r--source4/scripting/python/wscript_build2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 4e2b6728cd..d0159bb37a 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -360,4 +360,4 @@ bld.SAMBA_SCRIPT('python_dcerpc_init',
installdir='python/samba/dcerpc',
installname='__init__.py')
-bld.INSTALL_FILES('${PYTHONDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
+bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 227c63345d..540f3b7bb7 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -36,4 +36,4 @@ bld.SAMBA_SCRIPT('samba_python',
pattern='samba/**/*.py',
installdir='python')
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)