[flashrom-gerrit] Change in flashrom[master]: meson: use built-in options for install paths

[Thomas Heijligen (Code Review)]

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64028 )

Change subject: meson: use built-in options for install paths
......................................................................

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 
---
M meson.build
1 file changed, 2 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Edward O'Callaghan: Looks good to me, approved
  Anastasia Klimchuk: Looks good to me, approved

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')

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.