summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-17 19:38:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-17 19:38:12 +0100
commitc09d4b85b594fd16759037b2a3a7231c76b1e45c (patch)
tree0752a49ed180249e2ac61af0c811d1f966467f06 /source4
parent402d622c0c4f501ab7085848cec135a8ff4d8a4c (diff)
downloadsamba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.tar.gz
samba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.tar.bz2
samba-c09d4b85b594fd16759037b2a3a7231c76b1e45c.zip
wafsamba: Specify full vscript path so non-autogenerated files are possible, too.
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_build5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f8afe96f1e..205b9c1359 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -236,7 +236,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
bundled_name = libname
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
- if bld.env.HAVE_LD_VERSION_SCRIPT:
+ if version_script:
+ version_script = heimdal_path(version_script)
+ elif bld.env.HAVE_LD_VERSION_SCRIPT:
version_script = "%s.vscript" % libname
namespace = version.replace("-","_").replace("+","_").upper(),
HEIMDAL_GENERATOR(version_script,
@@ -244,6 +246,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
group='vscripts',
target=version_script)
deps.append(version_script)
+ version_script = os.path.join(bld.path.abspath(bld.env), version_script)
features = 'cc cshlib symlink_lib install_lib'