diff options
| author | Norbert Lange <nolange79@gmail.com> | 2020-07-14 00:49:25 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-07-18 13:50:39 +0900 |
| commit | 55678b9eae7a7bb0881c94b1e829192673b8e4b8 (patch) | |
| tree | 47d2b077d08ecac4f6d2f07baa99193a33a9cf02 | |
| parent | 0119ab3d6c1e17881ce9686221c7cbc650940953 (diff) | |
| download | systemd-55678b9eae7a7bb0881c94b1e829192673b8e4b8.tar.gz | |
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.
| -rw-r--r-- | man/systemd-initctl.service.xml | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | 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 0345936fce..ea93efd3f0 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"> <!-- 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 0c012b69fe..020a7e55ce 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 c641900c66..aa2ed115ea 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'], |