ldb: Fix installation of _ldb_text.py
authorAndreas Schneider <asn@samba.org>
Thu, 3 Dec 2015 11:07:27 +0000 (12:07 +0100)
committerGarming Sam <garming@samba.org>
Fri, 4 Dec 2015 05:08:29 +0000 (06:08 +0100)
_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.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
lib/ldb/wscript

index 41eca8af67bfedcb7c131dcfd1dd79bd514c1020..6a6cd83898fc48717c155895d71ced24e950a1cc 100755 (executable)
@@ -142,12 +142,12 @@ 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')
+            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: