diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-01-15 13:14:56 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2018-01-17 14:03:18 +0200 |
| commit | 4ebf6877926d35c27738d79b127e93c1d1cee5d5 (patch) | |
| tree | a66cd4721581b44430356186b7b5a7fe56e2b9d7 /assembler | |
| parent | d4e5b77b341010ae1aac8624175650c32913e3fd (diff) | |
meson: Refactor get_option() calls for directories
Fetch the configuration values in the toplevel meson.build for all
subdirs to share.
v2: Also remember tests/intel-ci/meson.build
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'assembler')
| -rw-r--r-- | assembler/meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/assembler/meson.build b/assembler/meson.build index b5ac678d..7517d82f 100644 --- a/assembler/meson.build +++ b/assembler/meson.build @@ -35,13 +35,11 @@ executable('intel-gen4asm', 'main.c', lfiles, pfiles, executable('intel-gen4disasm', 'disasm-main.c', link_with : lib_brw, install : true) -pkgconfigdir = join_paths(get_option('libdir'), 'pgkconfig') - conf_data = configuration_data() -conf_data.set('prefix', get_option('prefix')) +conf_data.set('prefix', prefix) conf_data.set('exec_prefix', '${prefix}') -conf_data.set('libdir', join_paths('${prefix}', get_option('libdir'))) -conf_data.set('includedir', join_paths('${prefix}', get_option('includedir'))) +conf_data.set('libdir', join_paths('${prefix}', libdir)) +conf_data.set('includedir', join_paths('${prefix}', includedir)) conf_data.set('VERSION', meson.project_version()) configure_file(input : 'intel-gen4asm.pc.in', output : 'intel-gen4asm.pc', configuration : conf_data, install_dir : pkgconfigdir) |