diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-07-09 17:27:12 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-07-27 15:51:58 +0300 |
| commit | b051e16eba17cb7eb36c141db6992830894542db (patch) | |
| tree | b8fa7d09c3250e77a5a53c1bf438068da2cafa56 /tools | |
| parent | 299880dcc048acf3261639cc31e2f8d5e5054df1 (diff) | |
meson: Prefix generated rpathdirs to designate their use
Since meson does not have variable scoping it gets confusing if you set
different values to the same variable in different places.
Let's prefix each generated rpathdir to be more explicit about their
intended use and to avoid accidental overwrites.
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/meson.build | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/meson.build b/tools/meson.build index 8ed1ccf4..ae9ba493 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -59,22 +59,22 @@ if get_option('use_rpath') # enforces this. # Start from the executable - rpathdir = '$ORIGIN' + tools_rpathdir = '$ORIGIN' # Executables are installed in bindir. Add a .. for each # directory name in it. foreach p : bindir.split('/') - rpathdir = join_paths(rpathdir, '..') + tools_rpathdir = join_paths(tools_rpathdir, '..') endforeach # Add relative path to libdir - rpathdir = join_paths(rpathdir, libdir) + tools_rpathdir = join_paths(tools_rpathdir, libdir) else - rpathdir = '' + tools_rpathdir = '' endif foreach prog : tools_progs executable(prog, prog + '.c', dependencies : tool_deps, - install_rpath : rpathdir, + install_rpath : tools_rpathdir, install : true) endforeach @@ -85,21 +85,21 @@ if libudev.found() ] executable('intel_dp_compliance', sources : intel_dp_compliance_src, dependencies : [tool_deps, libudev], - install_rpath : rpathdir, + install_rpath : tools_rpathdir, install : true) endif intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ] executable('intel_l3_parity', sources : intel_l3_parity_src, dependencies : tool_deps, - install_rpath : rpathdir, + install_rpath : tools_rpathdir, install : true) intel_reg_src = [ 'intel_reg.c', 'intel_reg_decode.c', 'intel_reg_spec.c' ] executable('intel_reg', sources : intel_reg_src, dependencies : tool_deps, install : true, - install_rpath : rpathdir, + install_rpath : tools_rpathdir, c_args : [ '-DIGT_DATADIR="@0@"'.format(join_paths(prefix, datadir)), ]) @@ -118,7 +118,7 @@ shared_library('intel_aubdump', 'aubdump.c', executable('intel_gpu_top', 'intel_gpu_top.c', install : true, - install_rpath : rpathdir, + install_rpath : tools_rpathdir, dependencies : tool_deps + [ lib_igt_perf ]) conf_data = configuration_data() |