commit 69a7c2bf590d27fa4a21bb8befb8c69e09cad653
author Ed Tanous <etanous@nvidia.com> Fri Jun 27 10:50:41 2025 -0700
committer Ed Tanous <ed@tanous.net> Fri Jun 27 20:09:08 2025 +0000
tree 156bd560b44e6f0470f911982f3329ad25a2f33a
parent 2c457bbdcccaedef8cf5b77c1302a5a2ac239ef5

Separate configure_file calls

Using the same metadata for each configure calls causes unquoted strings
to get put into config.h, which sets off clang-tidy warnings about macro
usage.  These two variables aren't used in code, and are only used to
configure the service file, so simplify the configure_file calls by
splitting them up.

Change-Id: I7e0be606117dc2b0d13830f2c8cfe4f44f917d58
Signed-off-by: Ed Tanous <etanous@nvidia.com>

meson.build

diff --git a/meson.build b/meson.build
index 13d6175..7e02851 100644
--- a/meson.build
+++ b/meson.build
@@ -15,9 +15,6 @@
 
 conf_data = configuration_data()
 
-bindir = get_option('prefix') / get_option('bindir')
-conf_data.set('BINDIR', bindir)
-conf_data.set('SYSTEMD_TARGET', get_option('systemd_target'))
 conf_data.set('STRICT_FAILSAFE_PWM', get_option('strict-failsafe-pwm'))
 conf_data.set('OFFLINE_FAILSAFE_PWM', get_option('offline-failsafe-pwm'))
 conf_data.set('UNC_FAILSAFE', get_option('unc-failsafe'))
@@ -57,10 +54,15 @@
     pkgconfig_define: ['prefix', get_option('prefix')],
 )
 
+systemd_conf_data = configuration_data()
+bindir = get_option('prefix') / get_option('bindir')
+systemd_conf_data.set('BINDIR', bindir)
+systemd_conf_data.set('SYSTEMD_TARGET', get_option('systemd_target'))
+
 configure_file(
     input: 'phosphor-pid-control.service.in',
     output: 'phosphor-pid-control.service',
-    configuration: conf_data,
+    configuration: systemd_conf_data,
     install: true,
     install_dir: systemd_system_unit_dir,
 )