Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / sysusers.d / meson.build

diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index 92b4128f8bb59f317d7e1d26bab8297193c38096..93a61f0d9a892606e5f7b23f2dbd95e245d86db5 100644 (file)
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -1,33 +1,31 @@
-# -*- mode: meson -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 in_files = ['basic.conf']
 
-enable_sysusers = conf.get('ENABLE_SYSUSERS', 0) == 1
-
 foreach file : in_files
-  gen = configure_file(
-      input : file + '.in',
-      output : file,
-      configuration : substs)
-  if enable_sysusers
-    install_data(gen,
-                 install_dir : sysusersdir)
-  endif
+        gen = configure_file(
+                input : file + '.in',
+                output : file,
+                configuration : substs)
+        if enable_sysusers
+                install_data(gen,
+                             install_dir : sysusersdir)
+        endif
 endforeach
 
 m4_files = ['systemd.conf']
 
-if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1
-  m4_files += ['systemd-remote.conf']
+if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
+        m4_files += ['systemd-remote.conf']
 endif
 
 foreach file : m4_files
-  custom_target(
-    'sysusers.d/' + file,
-    input : file + '.m4',
-    output: file,
-    command : [m4, '-P'] + m4_defines + ['@INPUT@'],
-    capture : true,
-    install : enable_sysusers,
-    install_dir : sysusersdir)
+        custom_target(
+                'sysusers.d_' + file,
+                input : file + '.m4',
+                output: file,
+                command : [meson_apply_m4, config_h, '@INPUT@'],
+                capture : true,
+                install : enable_sysusers,
+                install_dir : sysusersdir)
 endforeach