From 28163cb34fda3a42c14fbe7ce036291748bcc576 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Thu, 14 Nov 2019 12:15:47 -0800 Subject: determine target relative to the link directory rather than the full link path (which includes the file name) (#13727) --- lib/spack/spack/relocate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 472195866e..744338d7e5 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -488,11 +488,11 @@ def make_link_relative(cur_path_names, orig_path_names): Change absolute links to be relative. """ for cur_path, orig_path in zip(cur_path_names, orig_path_names): - old_src = os.readlink(orig_path) - new_src = os.path.relpath(old_src, orig_path) + target = os.readlink(orig_path) + relative_target = os.path.relpath(target, os.path.dirname(orig_path)) os.unlink(cur_path) - os.symlink(new_src, cur_path) + os.symlink(relative_target, cur_path) def make_macho_binaries_relative(cur_path_names, orig_path_names, old_dir, -- cgit v1.2.3-60-g2f50