# library use
import os
-import Utils
-from TaskGen import feature, before, after
+from waflib import Utils, Errors
+from waflib.TaskGen import feature, before, after
from samba_utils import LIB_PATH, MODE_755, install_rpath, build_rpath
@feature('install_bin')
# tell waf to install the right binary
bld.install_as(os.path.join(install_path, orig_target),
- os.path.join(self.path.abspath(bld.env), self.target),
+ self.path.find_or_declare(self.target),
chmod=MODE_755)
# tell waf to install the library
bld.install_as(os.path.join(install_path, install_name),
- os.path.join(self.path.abspath(bld.env), inst_name),
+ self.path.find_or_declare(inst_name),
chmod=MODE_755)
+
if install_link and install_link != install_name:
# and the symlink if needed
bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
return
if not self.link_task.outputs or not self.link_task.outputs[0]:
- raise Utils.WafError('no outputs found for %s in symlink_bin' % self.name)
+ raise Errors.WafError('no outputs found for %s in symlink_bin' % self.name)
binpath = self.link_task.outputs[0].abspath(self.env)
bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.link_task.outputs[0].name)