From: Andy Wingo Date: Tue, 1 Sep 2015 09:30:38 +0000 (+0200) Subject: PKTTYAGENT make variable X-Git-Tag: v219.9~1 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1716aac43107fcd96cd9105d44a2f8a02d307447;p=elogind.git PKTTYAGENT make variable * Makefile.am (PKTTYAGENT): Define as a variable so that users can make PKTTYAGENT=/whatever to select a specific pkttyagent path. --- diff --git a/Makefile.am b/Makefile.am index 84e15e9e5..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\" \