sysusers: simplify meson config

There were two parts, for templated and non-templated files, and
they were more different than they should be.

diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index 608c4b744a5558ef21ba7e224bf4a70ad7694c36..4402b1006b186cc1b909bc10bfb60d675dd8f599 100644 (file)
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -1,31 +1,21 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-files = [['README',                ''],
-         ['systemd-coredump.conf', 'ENABLE_COREDUMP'],
-         ['systemd-oom.conf',      'ENABLE_OOMD']]
+files = [['README',                true],
+         ['systemd-coredump.conf', conf.get('ENABLE_COREDUMP') == 1],
+         ['systemd-oom.conf',      conf.get('ENABLE_OOMD') == 1],
+         ['systemd-remote.conf',   conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1]]
 
-foreach pair : files
-        if not enable_sysusers
-                # do nothing
-        elif pair[1] == '' or conf.get(pair[1]) == 1
-                install_data(pair[0], install_dir : sysusersdir)
-        else
-                message('Not installing sysusers.d/@0@ because @1@ is @2@'
-                        .format(pair[0], pair[1], conf.get(pair[1], 0)))
+foreach tuple : files
+        if enable_sysusers and tuple[1]
+                install_data(tuple[0], install_dir : sysusersdir)
         endif
 endforeach
 
-
-if enable_sysusers and conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
-        install_data('systemd-remote.conf', install_dir : sysusersdir)
-endif
-
-
-in_files = [['basic.conf',            enable_sysusers],
-            ['systemd-journal.conf',  enable_sysusers],
-            ['systemd-network.conf',  enable_sysusers and conf.get('ENABLE_NETWORKD') == 1],
-            ['systemd-resolve.conf',  enable_sysusers and conf.get('ENABLE_RESOLVE') == 1],
-            ['systemd-timesync.conf', enable_sysusers and conf.get('ENABLE_TIMESYNCD') == 1]]
+in_files = [['basic.conf',            true],
+            ['systemd-journal.conf',  true],
+            ['systemd-network.conf',  conf.get('ENABLE_NETWORKD') == 1],
+            ['systemd-resolve.conf',  conf.get('ENABLE_RESOLVE') == 1],
+            ['systemd-timesync.conf', conf.get('ENABLE_TIMESYNCD') == 1]]
 
 foreach tuple : in_files
         file = tuple[0]
@@ -34,6 +24,6 @@ foreach tuple : in_files
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
-                install : tuple[1],
+                install : enable_sysusers and tuple[1],
                 install_dir : sysusersdir)
 endforeach