build: skip installation of 2 files if feature is disabled

dont install systemd-update-utmp if utmp is disabled.
dont install systemd-initctl.service if sysv is disabled.

diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 0345936fce0a2cbce2ed69a639f7432ab85cb174..ea93efd3f0153f6147455435f94e521ed8bf28cc 100644 (file)
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1+ -->
 
-<refentry id="systemd-initctl.service">
+<refentry id="systemd-initctl.service" conditional='HAVE_SYSV_COMPAT'>
 
   <refentryinfo>
     <title>systemd-initctl.service</title>

diff --git a/meson.build b/meson.build
index 0c012b69fe1f81ac15fa1058be8378eba809f308..020a7e55ce8f8be16806978a410a50d153760219 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3080,7 +3080,7 @@ executable(
         link_with : [libshared],
         dependencies : [libaudit],
         install_rpath : rootlibexecdir,
-        install : true,
+        install : (conf.get('ENABLE_UTMP') == 1),
         install_dir : rootlibexecdir)
 
 if conf.get('HAVE_KMOD') == 1

diff --git a/units/meson.build b/units/meson.build
index c641900c668433a075f5e1899e73949301cf2373..aa2ed115ea2bcff8a146c4a10800547a76494482 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -180,7 +180,7 @@ in_units = [
          'sysinit.target.wants/'],
         ['systemd-importd.service',              'ENABLE_IMPORTD',
          'dbus-org.freedesktop.import1.service'],
-        ['systemd-initctl.service',               ''],
+        ['systemd-initctl.service',              'HAVE_SYSV_COMPAT'],
         ['systemd-journal-gatewayd.service',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.service',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-upload.service',       'ENABLE_REMOTE HAVE_LIBCURL'],