Merge pull request #20303 from andir/sysconfig-example

{core, login}: respect install_sysconfdir_samples in meson file
This commit is contained in:
Yu Watanabe
2021-08-22 15:40:39 +09:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -202,7 +202,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
+1 -1
View File
@@ -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],