5 files changed, 24 insertions, 6 deletions
diff --git a/build-aux/Makefile.once.head/30-am.mk b/build-aux/Makefile.once.head/30-am.mk
index 9a27b86c82..d120e73ab8 100644
--- a/build-aux/Makefile.once.head/30-am.mk
+++ b/build-aux/Makefile.once.head/30-am.mk
@@ -54,6 +54,13 @@ _am.primaries += HEADERS
 _am.primaries += MANS
 #_am.primaries += TEXINFOS
 
+am.distmode_PROGRAMS    = nodist
+am.distmode_LTLIBRARIES = nodist
+am.distmode_SCRIPTS     = dist
+am.distmode_DATA        = nodist
+am.distmode_HEADERS     = dist
+am.distmode_MANS        = nodist
+
 # Used by the PROGRAMS and LTLIBRARIES passes
 _am.file2var = $(subst -,_,$(subst .,_,$1))
 _am.file2sources  = $(addprefix $(srcdir)/,$(notdir $($(_am.file2var)_SOURCES)))
@@ -129,7 +136,8 @@ define _am.pass2.doc
 #   - Global variable    : `MKDIR_P`
 #   - Global variable    : `am.INSTALL_$(primary)`
 #   - Global variable    : `am.outpat_$(dirname)_$(primary)`
-#   - Global variable    : `am.syspat_$(dirname)_$(primary)
+#   - Global variable    : `am.syspat_$(dirname)_$(primary)`
+#   - Global variable    : `am.distmode_$(primary)`
 #   - Global variable    : `$(dirname)dir`
 # Erased inputs:
 #   - Directory variable : `noinst_$(primary)`
@@ -182,14 +190,24 @@ $(foreach _am.primary,$(_am.primaries),
     dist_$(_am.dirname)_$(_am.primary)      ?=
     nodist_$(_am.dirname)_$(_am.primary)    ?=
 
-    $$(addprefix $$(DESTDIR)$$($(_am.dirname)dir)/,$$(notdir $(foreach v,$(_am.var_sys),$$($v)) )): \
+    $(am.distmode_$(_am.primary))_$(_am.dirname)_$(_am.primary) += $$($(_am.dirname)_$(_am.primary))
+
+    # nodist
+    $$(addprefix $$(DESTDIR)$$($(_am.dirname)dir)/,$$(notdir $$(nodist_$(_am.dirname)_$(_am.primary)) )): \
     $$(DESTDIR)$$($(_am.dirname)dir)/$(am.syspat_$(_am.dirname)_$(_am.primary)): $(call at.addprefix,$(outdir),$(am.outpat_$(_am.dirname)_$(_am.primary)))
 	@$$(NORMAL_INSTALL)
 	@$$(MKDIR_P) $$(@D)
 	$$(am.INSTALL_$(_am.primary))
 
-    am.out_$(_am.primary) := $$(patsubst $(am.syspat_$(_am.dirname)_$(_am.primary)),$(am.outpat_$(_am.dirname)_$(_am.primary)),$$(notdir $(foreach v,$(_am.var_out),$$($v)) ))
-    am.sys_$(_am.primary) := $$(addprefix $$($(_am.dirname)dir)/,$$(notdir                                                               $(foreach v,$(_am.var_sys),$$($v)) ))
+    # dist
+    $$(addprefix $$(DESTDIR)$$($(_am.dirname)dir)/,$$(notdir $$(dist_$(_am.dirname)_$(_am.primary)) )): \
+    $$(DESTDIR)$$($(_am.dirname)dir)/$(am.syspat_$(_am.dirname)_$(_am.primary)): $(call at.addprefix,$(srcdir),$(am.outpat_$(_am.dirname)_$(_am.primary)))
+	@$$(NORMAL_INSTALL)
+	@$$(MKDIR_P) $$(@D)
+	$$(am.INSTALL_$(_am.primary))
+
+    am.out_$(_am.primary) := $$(patsubst $(am.syspat_$(_am.dirname)_$(_am.primary)),$(am.outpat_$(_am.dirname)_$(_am.primary)),$$(notdir $$(nodist_$(_am.dirname)_$(_am.primary)) ))
+    am.sys_$(_am.primary) := $$(addprefix $$($(_am.dirname)dir)/,$$(notdir                                                               $$(nodist_$(_am.dirname)_$(_am.primary)) $$(dist_$(_am.dirname)_$(_am.primary)) ))
 
     undefine $(_am.dirname)_$(_am.primary)
     undefine dist_$(_am.dirname)_$(_am.primary)
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