s4-waf: fixed install location of external python libs

this merges with jelmers recent changes in master

diff --git a/lib/subunit/python/wscript_build b/lib/subunit/python/wscript_build
index 7e53d17ba5335dcd2685369e1a85bc6022eb14bf..f99ba42f04a22df75934252d075003c3cd2b8710 100644 (file)
--- a/lib/subunit/python/wscript_build
+++ b/lib/subunit/python/wscript_build
@@ -17,7 +17,3 @@ bld.SAMBA_SCRIPT('python_testtools',
                  pattern='testtools/**/*.py',
                  installdir='python')
 
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'subunit/**/*.py', flat=False)
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'testtools/**/*.py', flat=False)
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'iso8601/**/*.py', flat=False)
-

diff --git a/lib/wscript_build b/lib/wscript_build
index c47dfc01a8c54bf9ea20b56e5845426df6bcb05b..7424c7f7edc695fdda14e777117b37ac73fee224 100644 (file)
--- a/lib/wscript_build
+++ b/lib/wscript_build
@@ -17,5 +17,5 @@ for module, package in external_libs.iteritems():
         list.append(package)
 
 for e in list:
-    bld.INSTALL_WILDCARD('${PYTHONDIR}', e + '/**/*', flat=False,
+    bld.INSTALL_WILDCARD('${PYTHONDIR}/samba/external', e + '/**/*', flat=False,
                          exclude='*.pyc', trim_path=os.path.dirname(e))