diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-17 14:42:19 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-18 15:09:47 +1100 |
| commit | 1c5108c98b51c7c3edcd94d3a238d0476ece53dd (patch) | |
| tree | e8b4ce706f78accc40392394dd9bbad595d80a0b /buildtools/wafsamba/wafsamba.py | |
| parent | 88508291fe80829b559f8e6b91a7453e03479111 (diff) | |
| download | samba-1c5108c98b51c7c3edcd94d3a238d0476ece53dd.tar.gz samba-1c5108c98b51c7c3edcd94d3a238d0476ece53dd.tar.bz2 samba-1c5108c98b51c7c3edcd94d3a238d0476ece53dd.zip | |
waf: support building libraries with a directory prefix
SAMBA_LIBRARY('libsmb/smbclient') can now be built, which
distinguishes it from the binary 'smbclient'
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba/wafsamba.py')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 83972def10..4c9bf053a1 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -217,11 +217,11 @@ def SAMBA_LIBRARY(bld, libname, source, vscript = "%s.vscript" % libname bld.ABI_VSCRIPT(libname, abi_directory, version, vscript, abi_match) - fullname = bld.env.shlib_PATTERN % bundled_name + fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN) bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript)) if Options.is_install: # also make the .inst file depend on the vscript - instname = bld.env.shlib_PATTERN % (bundled_name + '.inst') + instname = apply_pattern(bundled_name + '.inst', bld.env.shlib_PATTERN) bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript)) vscript = os.path.join(bld.path.abspath(bld.env), vscript) |