From 688eb58204223dbc2c5a3680cd45d5fd3374bd17 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Tue, 3 May 2022 11:50:16 +0200 Subject: meson: use built-in options for install paths The install functions of meson can take a relative path and join the prefix automatically. Change-Id: I9cb9faf4bdbcfd66098478cc3a260eb3b664a2e6 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/64028 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Anastasia Klimchuk --- meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index a783bdda..3742a1d6 100644 --- a/meson.build +++ b/meson.build @@ -403,11 +403,6 @@ if need_serial endif endif -prefix = get_option('prefix') -sbindir = join_paths(prefix, get_option('sbindir')) -libdir = join_paths(prefix, get_option('libdir')) -mandir = join_paths(prefix, get_option('mandir')) - install_headers([ 'include/libflashrom.h', ], @@ -461,7 +456,7 @@ configure_file( output : 'flashrom.8', configuration : conf, install: true, - install_dir: join_paths(mandir, 'man8'), + install_dir: join_paths(get_option('mandir'), 'man8'), ) flashrom_dep = declare_dependency( @@ -501,7 +496,7 @@ executable( cargs ], install : true, - install_dir : sbindir, + install_dir : get_option('sbindir') ) subdir('util') -- cgit v1.2.3