From d7466066e468f9297bcad480003af882920c1159 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 18 Jun 2018 12:58:29 +0530 Subject: 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. --- mesonbuild/scripts/meson_install.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild/scripts') 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 -- cgit v1.1