projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d36785b
)
login: respect install_sysconfdir_samples in meson file
author
Andreas Rammhold
<andreas@rammhold.de>
Mon, 26 Jul 2021 15:20:34 +0000
(17:20 +0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 12 Oct 2021 14:23:01 +0000
(16:23 +0200)
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.
(cherry picked from commit
72964d047a7a8f79ae12ab41168feb0080eef6c3
)
src/login/meson.build
patch
|
blob
|
history
diff --git
a/src/login/meson.build
b/src/login/meson.build
index 8c20e6be65cc8a38b96c2e7a075d2fee57c0dd1f..b637adc9a2fbc75916ce6a3e7e486ca8673e416c 100644
(file)
--- 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],