[krb5-auth-dialog] Move manpage to data/
- From: Guido Günther <guidog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [krb5-auth-dialog] Move manpage to data/
- Date: Mon, 15 Feb 2021 12:35:32 +0000 (UTC)
commit 58526d9018c2ad025c6b5080675c00ca9ab12483
Author: Guido Günther <agx sigxcpu org>
Date: Sun Feb 14 13:24:28 2021 +0100
Move manpage to data/
{src => data}/krb5-auth-dialog.1.in | 0
data/meson.build | 7 +++++++
meson.build | 11 +++++++----
3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/src/krb5-auth-dialog.1.in b/data/krb5-auth-dialog.1.in
similarity index 100%
rename from src/krb5-auth-dialog.1.in
rename to data/krb5-auth-dialog.1.in
diff --git a/data/meson.build b/data/meson.build
index a35dc64..b83d628 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -30,3 +30,10 @@ if compile_schemas.found()
args: ['--strict', '--dry-run', meson.current_source_dir()]
)
endif
+
+man_conf = configuration_data()
+man_conf.set('minimum_lifetime', minimum_lifetime)
+man_conf.set('check_interval', check_interval)
+install_man(configure_file(input: 'krb5-auth-dialog.1.in',
+ output: 'krb5-auth-dialog.1',
+ configuration: man_conf))
diff --git a/meson.build b/meson.build
index 8fd2cfb..f30f3d2 100644
--- a/meson.build
+++ b/meson.build
@@ -97,12 +97,15 @@ meson.add_install_script(
# Both heimdal and mit ship a krb5.pc:
krb5_dep = dependency('krb5')
+minimum_lifetime = get_option('minimum-lifetime')
+check_interval = get_option('check-interval')
+
conf_data = configuration_data()
conf_data.set_quoted('PACKAGE', meson.project_name())
conf_data.set_quoted('VERSION', meson.project_version())
conf_data.set_quoted('PACKAGE_VERSION', meson.project_version())
-conf_data.set('CREDENTIAL_CHECK_INTERVAL', get_option('check-interval'))
-conf_data.set('MINUTES_BEFORE_PROMPTING', get_option('minimum-lifetime'))
+conf_data.set('CREDENTIAL_CHECK_INTERVAL', check_interval)
+conf_data.set('MINUTES_BEFORE_PROMPTING', minimum_lifetime)
conf_data.set_quoted('SC_PKCS11', get_option('pkcs11'))
conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf_data.set_quoted('LOCALE_DIR', localedir)
@@ -251,8 +254,8 @@ subdir('help')
subdir('etpo')
summary({
- 'Minimum Lifetime': conf_data.get('MINUTES_BEFORE_PROMPTING'),
- 'Check Interval': conf_data.get('CREDENTIAL_CHECK_INTERVAL'),
+ 'Minimum Lifetime': minimum_lifetime,
+ 'Check Interval': check_interval,
'pkinit': conf_data.get('ENABLE_PKINIT', 0),
'pkcs11': conf_data.get('SC_PKCS11'),
'pam-plugin': build_pam_plugin,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]