From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 2 Apr 2010 01:20:23 +0000 (+1100)
Subject: s4-waf: fixed install location of external python libs
X-Git-Tag: samba-3.6.0pre1~3291
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=9e52dc441e6709429194555350825ffcf341abf5;ds=sidebyside

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 7e53d17ba53..f99ba42f04a 100644
--- 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 c47dfc01a8c..7424c7f7edc 100644
--- 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))