diff options
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 5d60134..94bc00b 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -53,14 +53,12 @@ def buildparser(): def determine_installed_path(target, installdata): install_target = None for i in installdata.targets: - if os.path.basename(i[0]) == target.get_filename(): # FIXME, might clash due to subprojects. + if os.path.basename(i.fname) == target.get_filename(): # FIXME, might clash due to subprojects. install_target = i break if install_target is None: raise RuntimeError('Something weird happened. File a bug.') - fname = i[0] - outdir = i[1] - outname = os.path.join(installdata.prefix, outdir, os.path.basename(fname)) + outname = os.path.join(installdata.prefix, i.outdir, os.path.basename(i.fname)) # Normalize the path by using os.path.sep consistently, etc. # Does not change the effective path. return str(pathlib.PurePath(outname)) @@ -69,8 +67,9 @@ def determine_installed_path(target, installdata): def list_installed(installdata): res = {} if installdata is not None: - for path, installdir, aliases, *unknown in installdata.targets: - res[os.path.join(installdata.build_dir, path)] = os.path.join(installdata.prefix, installdir, os.path.basename(path)) + for t in installdata.targets: + res[os.path.join(installdata.build_dir, t.fname)] = \ + os.path.join(installdata.prefix, t.outdir, os.path.basename(t.fname)) for path, installpath, unused_prefix in installdata.data: res[path] = os.path.join(installdata.prefix, installpath) for path, installdir, unused_custom_install_mode in installdata.headers: |