aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-23 00:28:00 +0200
committerGitHub <noreply@github.com>2016-12-23 00:28:00 +0200
commit4b7c39d9d1bc378e93ab23d3d9e3f6a8b16cfbf5 (patch)
tree631f02002237fd7566c52a723647c26a583119a5 /mesonbuild/scripts
parent8ee1c9a07a3a35e3ed262fbc358fd86c257a966e (diff)
parentd5952531c717df50d4e762f47265036845acf499 (diff)
downloadmeson-4b7c39d9d1bc378e93ab23d3d9e3f6a8b16cfbf5.zip
meson-4b7c39d9d1bc378e93ab23d3d9e3f6a8b16cfbf5.tar.gz
meson-4b7c39d9d1bc378e93ab23d3d9e3f6a8b16cfbf5.tar.bz2
Merge pull request #1247 from centricular/fix-installed-soname-aliases
Fix soname symlinking after installation
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/meson_install.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 11dd320..c749b4f 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -222,14 +222,14 @@ def install_targets(d):
else:
raise RuntimeError('Unknown file type for {!r}'.format(fname))
printed_symlink_error = False
- for alias in aliases:
+ for alias, to in aliases.items():
try:
symlinkfilename = os.path.join(outdir, alias)
try:
os.unlink(symlinkfilename)
except FileNotFoundError:
pass
- os.symlink(os.path.split(fname)[-1], symlinkfilename)
+ os.symlink(to, symlinkfilename)
append_to_log(symlinkfilename)
except (NotImplementedError, OSError):
if not printed_symlink_error: