diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-04-08 21:46:20 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-04-08 22:11:49 +1000 |
commit | 4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5 (patch) | |
tree | 8d32526234eecdb5187869ba4c0b6093047d5442 /buildtools/wafsamba/samba_install.py | |
parent | eb9b7d0363669574de8ec380089407890f15eac2 (diff) | |
download | samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.tar.gz samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.tar.bz2 samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.zip |
build: make the handling of relative paths a bit saner
This should fix a problem that Anatoliy has struck with the PIDL
rules. It also brings us much closer to a working build for a true out
of tree build (ie. with waf configure -b /tmp/build)
Diffstat (limited to 'buildtools/wafsamba/samba_install.py')
-rw-r--r-- | buildtools/wafsamba/samba_install.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 30b607bf4c..fee456a8dd 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -117,7 +117,7 @@ def symlink_lib(self): if self.target.endswith('.inst'): return - blddir = Utils.g_module.blddir + blddir = os.path.dirname(self.bld.srcnode.abspath(self.bld.env)) libpath = self.link_task.outputs[0].abspath(self.env) # calculat the link target and put it in the environment @@ -132,8 +132,6 @@ def symlink_lib(self): link_target = os.path.join(blddir, link_target) - libpath = os_path_relpath(libpath, os.path.dirname(link_target)) - if os.path.lexists(link_target): os.unlink(link_target) os.symlink(libpath, link_target) @@ -147,11 +145,9 @@ def symlink_bin(self): if self.target.endswith('.inst'): return - blddir = Utils.g_module.blddir + blddir = os.path.dirname(self.bld.srcnode.abspath(self.bld.env)) binpath = self.link_task.outputs[0].abspath(self.env) - bldpath = os.path.join(blddir, os.path.basename(self.target)) - - binpath = os_path_relpath(binpath, os.path.dirname(bldpath)) + bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.target) if os.path.lexists(bldpath): os.unlink(bldpath) |