diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 02:30:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 02:06:06 +0000 |
| commit | c9756cac057444ff7c3a77b9260fa30c35267529 (patch) | |
| tree | 7d7a4fb5846719354d77dcee46db9b7dc4b073f6 /source4 | |
| parent | 21233bba9663f684cfa1ad129baa988cb52dea4d (diff) | |
| download | samba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.gz samba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.bz2 samba-c9756cac057444ff7c3a77b9260fa30c35267529.zip | |
waf: Put private libraries in a separate directory when building.
Thanks to Tridge for pointing out what exactly I had to change. :-)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/wscript | 1 | ||||
| -rw-r--r-- | source4/wscript | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 2273def930..19f7a0bb93 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -140,6 +140,7 @@ def cmd_testonly(opt): # this is needed for systems without rpath, or with rpath disabled ADD_LD_LIBRARY_PATH('bin/shared') + ADD_LD_LIBRARY_PATH('bin/shared/private') # if we are using a system version of ldb then we need to tell it to # load modules from our modules path diff --git a/source4/wscript b/source4/wscript index fad9c3451f..8b2ab58d27 100644 --- a/source4/wscript +++ b/source4/wscript @@ -156,7 +156,7 @@ def build(bld): def pydoctor(ctx): '''build python apidocs''' - cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba' + cmd='PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba' print("Running: %s" % cmd) os.system(cmd) @@ -166,7 +166,7 @@ def wafdocs(ctx): os.system('pwd') list = recursive_dirlist('../buildtools/wafsamba', '.', pattern='*.py') - cmd='LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext' + cmd='PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext' print(list) for f in list: cmd += ' --add-module %s' % f |