mirror of
https://github.com/samba-team/samba.git
synced 2025-08-02 00:22:11 +03:00
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
This commit is contained in:
@ -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',
|
||||
|
@ -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')
|
||||
|
@ -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)
|
||||
|
Reference in New Issue
Block a user