Thomas Heijligen submitted this change.

View Change

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 <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/64028
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
M meson.build
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index a783bdd..3742a1d 100644
--- a/meson.build
+++ b/meson.build
@@ -403,11 +403,6 @@
   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 @@
   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 @@
     cargs
   ],
   install : true,
-  install_dir : sbindir,
+  install_dir : get_option('sbindir')
 )
 
 subdir('util')

To view, visit change 64028. To unsubscribe, or for help writing mail filters, visit settings.