From cfd760b6a77808d0b9451ed618a23b6259fe525f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 26 Jul 2021 16:57:43 +0200 Subject: [PATCH 1/2] core: respect install_sysconfdir_samples in meson file The refactoring done in e11a25cadbe caused the configuration files to be installed into the pkgsysconfdir regardless of the state of the install_sysconfdir_samples boolean that indicates whether or not the sample files should be installed. --- src/core/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/meson.build b/src/core/meson.build index 1c364a53e2..728e2f0807 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -195,7 +195,7 @@ foreach item : in_files output: file, command : [meson_render_jinja2, config_h, '@INPUT@'], capture : true, - install : dir != 'no', + install : (dir == pkgsysconfdir and install_sysconfdir_samples) or (dir != pkgsysconfdir and dir != 'no'), install_dir : dir) endforeach From 72964d047a7a8f79ae12ab41168feb0080eef6c3 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 26 Jul 2021 17:20:34 +0200 Subject: [PATCH 2/2] login: respect install_sysconfdir_samples in meson file The refactoring done in c900d89faa0 caused the configuration files to be installed into the pkgsysconfdir regardless of the state of the install_sysconfdir_samples boolean that indicates whether or not the sample files should be installed. --- src/login/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/login/meson.build b/src/login/meson.build index 8c20e6be65..b637adc9a2 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c') enable_logind = conf.get('ENABLE_LOGIND') == 1 in_files = [ - ['logind.conf', pkgsysconfdir, enable_logind], + ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples], ['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1], ['71-seat.rules', udevrulesdir, enable_logind], ['73-seat-late.rules', udevrulesdir, enable_logind],