diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-18 12:58:29 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-18 09:57:18 +0000 |
| commit | d7466066e468f9297bcad480003af882920c1159 (patch) | |
| tree | d51f9eab67fdb3eeefee04dea748580e49fb2621 /mesonbuild/scripts | |
| parent | 5ef38d880f54a848474e5faa23c6a2c8377d9d61 (diff) | |
| download | meson-d7466066e468f9297bcad480003af882920c1159.zip meson-d7466066e468f9297bcad480003af882920c1159.tar.gz meson-d7466066e468f9297bcad480003af882920c1159.tar.bz2 | |
meson_install: Don't add DESTDIR to install_name
This was added accidentally. Includes a test for it.
Also fix a rebase error. The variable was defined incorrectly and was
overwritten with the correct value immediately afterwards.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 3fbb1cc..2c718b4 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -362,9 +362,8 @@ def install_targets(d): for t in d.targets: fname = check_for_stampfile(t.fname) outdir = get_destdir_path(d, t.outdir) - final_path = os.path.join(d.prefix, t.outdir, fname) outname = os.path.join(outdir, os.path.basename(fname)) - final_path = os.path.join(d.prefix, outname) + final_path = os.path.join(d.prefix, t.outdir, os.path.basename(fname)) aliases = t.aliases should_strip = t.strip install_name_mappings = t.install_name_mappings |