meson: build kernel-install man page when necessary

diff --git a/man/rules/meson.build b/man/rules/meson.build
index aaa69d30385c27bb2c2773662e109d5fbf0a5480..f10abdaf0d13aff0d345e54e3ba04e6f1489fe59 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -30,7 +30,7 @@ manpages = [
  ['journalctl', '1', [], ''],
  ['journald.conf', '5', ['journald.conf.d', 'journald@.conf'], ''],
  ['kernel-command-line', '7', [], ''],
- ['kernel-install', '8', [], ''],
+ ['kernel-install', '8', [], 'ENABLE_KERNEL_INSTALL'],
  ['libudev', '3', [], ''],
  ['loader.conf', '5', [], 'HAVE_GNU_EFI'],
  ['locale.conf', '5', [], ''],

diff --git a/meson.build b/meson.build
index e68791b8b4db2b01afa105bc1a85b8e31811768b..311895db5e6594c6e73bc24668d87fae1130f514 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1675,6 +1675,9 @@ else
 endif
 conf.set10('ENABLE_IMPORTD', have)
 
+want_kernel_install = get_option('kernel-install')
+conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install)
+
 want_homed = get_option('homed')
 if want_homed != 'false'
         have = (conf.get('HAVE_OPENSSL') == 1 and
@@ -4143,7 +4146,7 @@ foreach tuple : [
         ['hwdb'],
         ['importd'],
         ['initrd'],
-        ['kernel-install',        get_option('kernel-install')],
+        ['kernel-install'],
         ['localed'],
         ['logind'],
         ['machined'],

diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 963a11b6ceeeafcb1809be6a6f9fd2141054683d..ae6a61e555415e66e3c0ca28c31555aec074ac47 100644 (file)
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -31,7 +31,7 @@ items = [['busctl',              ''],
          ['systemd-path',        ''],
          ['systemd-run',         ''],
          ['udevadm',             ''],
-         ['kernel-install',      ''],
+         ['kernel-install',      'ENABLE_KERNEL_INSTALL'],
          ['bootctl',             'HAVE_GNU_EFI'],
          ['coredumpctl',         'ENABLE_COREDUMP'],
          ['homectl',             'ENABLE_HOMED'],

diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index 6dca9dd59582f9eb2437859cd9257da10a59d7c0..bac531798cce162bbb0eb21b0ae4201388094c39 100644 (file)
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -22,7 +22,7 @@ items = [['_busctl',                   ''],
          ['_systemd-path',             ''],
          ['_systemd-run',              ''],
          ['_udevadm',                  ''],
-         ['_kernel-install',           ''],
+         ['_kernel-install',           'ENABLE_KERNEL_INSTALL'],
          ['_sd_hosts_or_user_at_host', ''],
          ['_sd_outputmodes',           ''],
          ['_sd_unit_files',            ''],

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 508058f1cfda015e89243853c39e211fc9ea63eb..abc3520b6257d5326adcec18b831f855a9395d08 100644 (file)
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-want_kernel_install = get_option('kernel-install')
-
 if want_kernel_install
         install_data('kernel-install',
                      install_mode : 'rwxr-xr-x',