diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-01 16:36:10 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-02 15:21:13 +1100 |
| commit | a3e99356abab3fd77a87d2ac594243b3f77e3cdd (patch) | |
| tree | dedc3cc9436b0b8cef4d5b4a8aa25371aebc4f3d /lib | |
| parent | dbe0b078492ea20da2b0aa3bb1d1c6138d16454e (diff) | |
| download | samba-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 'lib')
| -rw-r--r-- | lib/wscript_build | 4 |
1 files changed, 2 insertions, 2 deletions
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', |