Prep 234: Fix Makefile.am to install elogind in rootlibexecdir, like upstream does...

diff --git a/Makefile.am b/Makefile.am
index 029c5ff960bddd1d1e64ad11462a9f9c086549fc..92becb7abc6c548a2e64ddcad9fd36e0c8bff336 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,11 +204,7 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =

-rootlibexec_PROGRAMS = \
-       elogind \
-       elogind-cgroups-agent
-
-pkglibexec_PROGRAMS =
+rootlibexec_PROGRAMS =

 
 dist_doc_DATA = \
        README \
 
 dist_doc_DATA = \
        README \


@@ -906,7 +902,7 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
 endif
 
 # ------------------------------------------------------------------------------

-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \

        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \


@@ -1150,7 +1146,7 @@ endif
 noinst_LTLIBRARIES += \
        libelogind-core.la
 
 noinst_LTLIBRARIES += \
        libelogind-core.la
 

-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \

        elogind
 
 loginctl_SOURCES = \
        elogind
 
 loginctl_SOURCES = \