summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-02 12:20:23 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:22 +1000
commit9e52dc441e6709429194555350825ffcf341abf5 (patch)
treef52295572fda75e1adbe39cc49567c20db09c704
parent9eb5cb784ceeab4d53cf01890b21a28043467dfa (diff)
downloadsamba-9e52dc441e6709429194555350825ffcf341abf5.tar.gz
samba-9e52dc441e6709429194555350825ffcf341abf5.tar.bz2
samba-9e52dc441e6709429194555350825ffcf341abf5.zip
s4-waf: fixed install location of external python libs
this merges with jelmers recent changes in master
-rw-r--r--lib/subunit/python/wscript_build4
-rw-r--r--lib/wscript_build2
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/subunit/python/wscript_build b/lib/subunit/python/wscript_build
index 7e53d17ba5..f99ba42f04 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 c47dfc01a8..7424c7f7ed 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))