summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-05-10 15:41:56 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-05-10 15:46:27 -0400
commita20fc02bda77dea232b0e3eb82dca9bef7dc3861 (patch)
treea33670e1b6a6e4d3bf5a32a5f404e71214a91cbb /src
parent0dbfeb32955bccd4360f7142ecc24b8012db6f27 (diff)
fixo
Diffstat (limited to 'src')
-rw-r--r--src/grp-login/.gitignore1
-rw-r--r--src/grp-login/pam_systemd/.gitignore1
-rw-r--r--src/grp-login/pam_systemd/Makefile2
-rw-r--r--src/grp-login/pam_systemd/systemd-user.pam.m4 (renamed from src/grp-login/systemd-logind/systemd-user.pam.m4)0
4 files changed, 2 insertions, 2 deletions
diff --git a/src/grp-login/.gitignore b/src/grp-login/.gitignore
index 3a8ba497c1..4e5702a8e8 100644
--- a/src/grp-login/.gitignore
+++ b/src/grp-login/.gitignore
@@ -3,4 +3,3 @@
/org.freedesktop.login1.policy
/71-seat.rules
/73-seat-late.rules
-/systemd-user
diff --git a/src/grp-login/pam_systemd/.gitignore b/src/grp-login/pam_systemd/.gitignore
new file mode 100644
index 0000000000..f3bb5b971b
--- /dev/null
+++ b/src/grp-login/pam_systemd/.gitignore
@@ -0,0 +1 @@
+/systemd-user
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
index 2243572b11..4239d23df5 100644
--- a/src/grp-login/pam_systemd/Makefile
+++ b/src/grp-login/pam_systemd/Makefile
@@ -47,7 +47,7 @@ pamlib_LTLIBRARIES = \
pam_systemd.la
ifneq ($(ENABLE_PAM_CONFIG),)
-dist_pamconf_DATA = \
+nodist_pamconf_DATA = \
src/login/systemd-user
endif
diff --git a/src/grp-login/systemd-logind/systemd-user.pam.m4 b/src/grp-login/pam_systemd/systemd-user.pam.m4
index e33963b125..e33963b125 100644
--- a/src/grp-login/systemd-logind/systemd-user.pam.m4
+++ b/src/grp-login/pam_systemd/systemd-user.pam.m4