X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=fe421287a2c4163bf90f1115cfb5ac6fbe298efd;hb=2055a4de39bdf062645a7a58b50aae029df80857;hp=6e8805898aa6d564b3a6a6e56015c8b29f17285f;hpb=e19b8719a54c343372e16b462c27f1e84c987b85;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 6e8805898..fe421287a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,8 @@ zshcompletiondir=@zshcompletiondir@
 systemsleepdir=$(pkglibexecdir)/sleep.d
 systemshutdowndir=$(pkglibexecdir)/shutdown.d
 
+PKTTYAGENT=$(bindir)/pkttyagent
+
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
 pkgincludedir=$(includedir)/elogind
@@ -120,7 +122,7 @@ AM_CPPFLAGS = \
 	-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
 	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
 	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-DHALT=\"$(HALT)\" \
@@ -375,6 +377,9 @@ libbasic_la_CFLAGS = \
 	$(CAP_CFLAGS) \
 	-pthread
 
+libbasic_la_LDFLAGS = \
+	$(CAP_LDFLAGS)
+
 libbasic_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(CAP_LIBS) \
@@ -730,7 +735,7 @@ dist_dbuspolicy_DATA += \
 	src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-	src/login/elogind.conf
+	src/login/logind.conf
 
 polkitpolicy_files += \
 	src/login/org.freedesktop.login1.policy
@@ -791,9 +796,6 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
 	$(SED_PROCESS)
 
-%.conf: %.conf.in
-	$(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
 	$(SED_PROCESS)