From a3e99356abab3fd77a87d2ac594243b3f77e3cdd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 1 Feb 2011 16:36:10 +1100 Subject: 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 --- lib/wscript_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/wscript_build') diff --git a/lib/wscript_build b/lib/wscript_build index bc9d5ed5f1..9ce832a2fd 100644 --- 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', -- cgit