Version 234.2 Release

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 029c5ff960bddd1d1e64ad11462a9f9c086549fc..b95a1e0171bac6b5fc9eccc56504fcc64926d309 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=19
-LIBELOGIND_REVISION=0
+LIBELOGIND_REVISION=2
 LIBELOGIND_AGE=19
 
 # Dirs of external packages
@@ -65,14 +65,16 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
+
 rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+rootlibdir=@rootlibdir@
+rootlibexecdir=@rootlibexecdir@
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -204,11 +206,7 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
-rootlibexec_PROGRAMS = \
-       elogind \
-       elogind-cgroups-agent
-
-pkglibexec_PROGRAMS =
+rootlibexec_PROGRAMS =
 
 dist_doc_DATA = \
        README \
@@ -906,7 +904,7 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
@@ -1150,7 +1148,7 @@ endif
 noinst_LTLIBRARIES += \
        libelogind-core.la
 
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind
 
 loginctl_SOURCES = \