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

diff --git a/lib/wscript_build b/lib/wscript_build
index bc9d5ed5f1a646d938b79e0bf075ec25148f9a50..9ce832a2fd1f9a88c66c14ee9b6279d7506df378 100644 (file)
--- a/lib/wscript_build
+++ b/lib/wscript_build
@@ -17,14 +17,14 @@ for module, package in external_libs.items():
         list.append(package)
 
 for e in list:
-    bld.INSTALL_WILDCARD('${PYTHONDIR}/samba/external', e + '/**/*', flat=False,
+    bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/external', e + '/**/*', flat=False,
                          exclude='*.pyc', trim_path=os.path.dirname(e))
 
 bld.SAMBA_GENERATOR('external_init_py',
                     rule='touch ${TGT}',
                     target='empty_file')
 
-bld.INSTALL_FILES('${PYTHONDIR}/samba/external', 'empty_file', destname='__init__.py')
+bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/external', 'empty_file', destname='__init__.py')
 
 # a grouping library for event and socket related subsystems
 bld.SAMBA_LIBRARY('samba-sockets',

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 4e2b6728cd81cd3dea3d00bb73b4c4764422198c..d0159bb37a7f59a1a0f25172324d29d79e560803 100755 (executable)
--- 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 227c63345d724efe6cb937ce1746ab2e1bddb54e..540f3b7bb7e7f4282f8879233beb241c67fb1d94 100644 (file)
--- 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)