meson: fix systemd service bugs
The logic for ENABLE_PHAL_TRUE was reversed under meson.
prefix was omitted when computing the path for the bindir replacement
token in the system unit files.
Fixes: 919e408aaad453f94e1ff3d35440b8fc8a2f3e13
Change-Id: I096d1f69554b23c20bd4836b36ffa5656a219333
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meson.build b/meson.build
index d866370..a6c067b 100644
--- a/meson.build
+++ b/meson.build
@@ -18,8 +18,8 @@
extra_unit_files = []
unit_subs = configuration_data()
-unit_subs.set('bindir', get_option('bindir'))
-unit_subs.set('ENABLE_PHAL_TRUE', '')
+unit_subs.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
+unit_subs.set('ENABLE_PHAL_TRUE', '#')
if get_option('phal').enabled() and get_option('p9').enabled()
error('phal and p9 cannot be selected at the same time')
@@ -67,7 +67,7 @@
'set-spi-mux.service',
'phal-reinit-devtree.service',
]
- unit_subs.set('ENABLE_PHAL_TRUE', '#')
+ unit_subs.set('ENABLE_PHAL_TRUE', '')
endif
executable(