From 4ebf6877926d35c27738d79b127e93c1d1cee5d5 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Mon, 15 Jan 2018 13:14:56 +0200 Subject: 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 Cc: Daniel Vetter Reviewed-by: Daniel Vetter --- assembler/meson.build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'assembler') 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) -- cgit v1.2.3