From c09d4b85b594fd16759037b2a3a7231c76b1e45c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 17 Dec 2010 19:38:12 +0100 Subject: wafsamba: Specify full vscript path so non-autogenerated files are possible, too. --- buildtools/wafsamba/samba_install.py | 2 +- buildtools/wafsamba/wafsamba.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 3c24679a72e..5902d731f65 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -156,7 +156,7 @@ def apply_vscript(self): if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''): self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" % - os.path.join(self.path.abspath(self.env), self.version_script)) + self.version_script) self.version_script = None diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index d92c90fb0ec..92041040c2f 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -219,6 +219,7 @@ def SAMBA_LIBRARY(bld, libname, source, # also make the .inst file depend on the vscript instname = bld.env.shlib_PATTERN % (bundled_name + '.inst') 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) bld.SET_BUILD_GROUP(group) t = bld( -- cgit v1.2.1