From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 25 Jun 2023 06:13:25 +0000 (+0900)
Subject: meson: move declaration of PID1
X-Git-Tag: v255-rc1~867^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28153%2Fhead;p=thirdparty%2Fsystemd.git

meson: move declaration of PID1
---

diff --git a/meson.build b/meson.build
index bd62198ef07..4b68ccfeddf 100644
--- a/meson.build
+++ b/meson.build
@@ -2533,24 +2533,6 @@ endforeach
 
 ############################################################
 
-exe = executable(
-        'systemd',
-        systemd_sources,
-        include_directories : includes,
-        link_with : [libcore,
-                     libshared],
-        dependencies : [libseccomp,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-dbus_programs += exe
-public_programs += exe
-
-meson.add_install_script(meson_make_symlink,
-                         libexecdir / 'systemd',
-                         sbindir / 'init')
-
 exe = executable(
         'systemd-analyze',
         systemd_analyze_sources,
diff --git a/src/core/meson.build b/src/core/meson.build
index c3a45dc3b12..9f04a9e019e 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -141,6 +141,20 @@ systemd_sources = files(
         'crash-handler.c',
 )
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd',
+                'dbus' : true,
+                'public' : true,
+                'sources' : systemd_sources,
+                'link_with' : [
+                        libcore,
+                        libshared,
+                ],
+                'dependencies' : libseccomp,
+        },
+]
+
 in_files = [['system.conf',                     pkgsysconfdir],
             ['user.conf',                       pkgsysconfdir],
             ['org.freedesktop.systemd1.policy', polkitpolicydir]]
@@ -183,6 +197,10 @@ if install_sysconfdir
         meson.add_install_script('sh', '-c', mkdir_p.format(sysconfdir / 'xdg/systemd'))
 endif
 
+meson.add_install_script(meson_make_symlink,
+                         libexecdir / 'systemd',
+                         sbindir / 'init')
+
 ############################################################
 
 test_core_base = {