diff options
| author | Andreas Schneider <asn@samba.org> | 2017-07-06 07:44:28 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-07-07 09:14:26 +0200 |
| commit | 98e30cf491c63eb0b69c13ad42b720d22944adda (patch) | |
| tree | fb231c35ae983277cf2f178752344cf4df4f7bce /lib/ldb | |
| parent | 5eccc2fd0072409f166c63e6876266f926411423 (diff) | |
| download | samba-98e30cf491c63eb0b69c13ad42b720d22944adda.tar.gz | |
waf: Do not install _ldb_text.py if we have system libldb
_ldb_text.py is installed as part of the ldb package and also if you
compile Samba with the system ldb version. This way we have have the
file twice in the same location and run into file confilcts.
This has already been fixed some time ago:
60dc26bfe1573265dcbd87b9dd3439f945e57d97
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12882
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'lib/ldb')
| -rw-r--r-- | lib/ldb/wscript | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 7f81fe3f098..b4ae62a30ec 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -177,12 +177,15 @@ def build(bld): realname='ldb.so', cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_SCRIPT('_ldb_text.py', - pattern='_ldb_text.py', - installdir='python') + # Do only install this file as part of the Samba build if we do not + # use the system libldb! + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): + bld.SAMBA_SCRIPT('_ldb_text.py', + pattern='_ldb_text.py', + installdir='python') - bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') + bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') if not bld.CONFIG_SET('USING_SYSTEM_LDB'): if bld.is_install: |