X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=710eb7c98c16a3c9ad82b225ec322b9eb16ab95e;hp=bb4885d478b7d48b672651d3f413190760696b09;hb=e2060a1f35d212ff8bf92f6d81bace190a6d15e9;hpb=ef2aa93b7a4c742ae74496566344fd71e411fa72 diff --git a/Makefile.am b/Makefile.am index bb4885d47..710eb7c98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,8 @@ systemshutdowndir=$(pkglibexecdir)/shutdown.d udevrulesdir=@udevrulesdir@ udevbindir=@udevbindir@ +PKTTYAGENT=$(bindir)/pkttyagent + # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/elogind pkgincludedir=$(includedir)/elogind @@ -115,12 +117,10 @@ CLEANFILES = $(BUILT_SOURCES) \ $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \ $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS) -# FIXME a different pkttyagent path... - AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ - -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ + -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ @@ -503,6 +503,9 @@ libelogind_shared_la_LIBADD = \ $(CAP_LIBS) \ -lm +libelogind_shared_la_LDFLAGS = \ + $(CAP_LDFLAGS) + # ------------------------------------------------------------------------------ if HAVE_ACL noinst_LTLIBRARIES += \