From 55678b9eae7a7bb0881c94b1e829192673b8e4b8 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Tue, 14 Jul 2020 00:49:25 +0200 Subject: [PATCH] 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. --- man/systemd-initctl.service.xml | 2 +- meson.build | 2 +- units/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml index 0345936fce0..ea93efd3f01 100644 --- 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"> - + systemd-initctl.service diff --git a/meson.build b/meson.build index 0c012b69fe1..020a7e55ce8 100644 --- 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 c641900c668..aa2ed115ea2 100644 --- 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'], -- 2.39.2