X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bd2bc927f6a8bc894decdd781daa728e30a4819e;hp=c517a33cf91ddf71547641b321aedb19e58933fd;hb=b78378a2ba194084d85810dd5721217bb4337edc;hpb=7065fad702ec00cf721d3b605be8151009830859

diff --git a/Makefile.am b/Makefile.am
index c517a33cf..bd2bc927f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,19 +54,20 @@ bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
 varlogdir=$(localstatedir)/log
 elogindstatedir=$(localstatedir)/lib/elogind
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
+
+udevrulesdir=@udevrulesdir@
+udevbindir=@udevbindir@
+
+PKTTYAGENT=$(bindir)/pkttyagent
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
 pkgincludedir=$(includedir)/elogind
-udevrulesdir=$(rootprefix)/lib/udev/rules.d
 factory_etcdir = $(prefix)/share/factory/etc
 factory_pamdir = $(prefix)/share/factory/etc/pam.d
 
-# And these are the special ones for /
-rootprefix=@rootprefix@
-rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
-
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -116,22 +117,22 @@ 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)\" \
+	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/logind-cgroups-agent\" \
 	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
 	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
 	-DROOTPREFIX=\"$(rootprefix)\" \
-	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+	-DHALT=\"$(HALT)\" \
+	-DREBOOT=\"$(REBOOT)\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
-	-DROOTLIBDIR=\"$(rootlibdir)\" \
-	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/shared \
@@ -148,18 +149,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-define move-to-rootlibdir
-	if test "$(libdir)" != "$(rootlibdir)"; then \
-		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-		rm -f $(DESTDIR)$(libdir)/$$libname && \
-		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-	fi
-endef
-
-INSTALL_DIRS =
-
 SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
@@ -203,9 +192,6 @@ define add-wants
 	  for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
 endef
 
-install-directories-hook:
-	$(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
-
 install-aliases-hook:
 	set -- $(GENERAL_ALIASES) && \
 		dir= && $(install-relative-aliases)
@@ -233,7 +219,6 @@ install-touch-usr-hook:
 
 INSTALL_EXEC_HOOKS += \
 	install-target-wants-hook \
-	install-directories-hook \
 	install-aliases-hook \
 	install-touch-usr-hook
 
@@ -264,9 +249,8 @@ AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
 AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
-rootbin_PROGRAMS =
 bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
 dist_bashcompletion_DATA =
 dist_zshcompletion_DATA =
 
@@ -520,6 +504,9 @@ libelogind_shared_la_LIBADD = \
 	$(CAP_LIBS) \
 	-lm
 
+libelogind_shared_la_LDFLAGS = \
+	$(CAP_LDFLAGS)
+
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -632,7 +619,6 @@ libelogind_internal_la_SOURCES = \
 	src/systemd/sd-login.h \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h \
-	src/systemd/sd-path.h \
 	src/systemd/sd-network.h \
 	src/systemd/sd-device.h \
 	src/libelogind/sd-bus/sd-bus.c \
@@ -692,7 +678,6 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-id128/sd-id128.c \
 	src/libelogind/sd-daemon/sd-daemon.c \
 	src/libelogind/sd-login/sd-login.c \
-	src/libelogind/sd-path/sd-path.c \
 	src/libelogind/sd-network/sd-network.c \
 	src/libelogind/sd-network/network-util.h \
 	src/libelogind/sd-network/network-util.c \
@@ -735,15 +720,6 @@ libelogind_la_LDFLAGS = \
 libelogind_la_LIBADD = \
 	libelogind-internal.la
 
-libelogind-install-hook:
-	libname=libelogind.so && $(move-to-rootlibdir)
-
-libelogind-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
-
-INSTALL_EXEC_HOOKS += libelogind-install-hook
-UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
-
 pkgconfiglib_DATA += \
 	src/libelogind/libelogind.pc
 
@@ -816,8 +792,7 @@ endif
 noinst_LTLIBRARIES += \
 	libelogind-core.la
 
-rootlibexec_PROGRAMS += \
-	elogind
+pkglibexec_PROGRAMS += elogind
 
 loginctl_SOURCES = \
 	src/login/loginctl.c \
@@ -829,9 +804,19 @@ loginctl_LDADD = \
 	libelogind-internal.la \
 	libelogind-shared.la
 
-rootbin_PROGRAMS += \
+bin_PROGRAMS += \
 	loginctl
 
+logind_cgroups_agent_SOURCES = \
+	src/cgroups-agent/cgroups-agent.c
+
+logind_cgroups_agent_LDADD = \
+	libelogind-internal.la \
+	libelogind-shared.la
+
+pkglibexec_PROGRAMS += \
+	logind-cgroups-agent
+
 dist_bashcompletion_DATA += \
 	shell-completion/bash/loginctl
 
@@ -845,7 +830,7 @@ systemd_inhibit_LDADD = \
 	libelogind-internal.la \
 	libelogind-shared.la
 
-rootbin_PROGRAMS += \
+bin_PROGRAMS += \
 	systemd-inhibit
 
 test_login_SOURCES = \
@@ -926,9 +911,6 @@ dist_pkgsysconf_DATA += \
 polkitpolicy_files += \
 	src/login/org.freedesktop.login1.policy
 
-INSTALL_DIRS += \
-	$(elogindstatedir)
-
 SYSTEM_UNIT_ALIASES += \
 	elogind.service dbus-org.freedesktop.login1.service
 
@@ -952,12 +934,10 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
-       '|rootlibexecdir=$(rootlibexecdir)|' \
-       '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
+       '|udevbindir=$(udevbindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
        '|pkgdatadir=$(pkgdatadir)|' \
-       '|udevrulesdir=$(udevrulesdir)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -968,7 +948,6 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|VARLOGDIR=$(varlogdir)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|'
 
@@ -1117,9 +1096,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-	--with-rootprefix=$$dc_install_base \
-	--disable-split-usr \
-	--enable-kdbus
+	--enable-kdbus \
+	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
 
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \