[systemd-commits] Makefile.am

[Lennart Poettering]

 Makefile.am |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f401faf540ee31740b4cd0a8b3d4038ea8c33092
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 2 00:40:10 2010 +0200

    build-sys: move systemd from /sbin to /bin since it should be used by normal users too, for session handling

diff --git a/Makefile.am b/Makefile.am
index 5f880af..f5c43da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ sessionunitdir=$(pkgdatadir)/session
 
 # And these are the special ones for /
 rootdir=@rootdir@
-rootsbindir=$(rootdir)/sbin
 rootbindir=$(rootdir)/bin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
@@ -42,13 +41,11 @@ AM_CPPFLAGS = \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootsbindir)/systemd\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
 	-I $(top_srcdir)/src
 
-rootsbin_PROGRAMS = \
-	systemd
-
 rootbin_PROGRAMS = \
+	systemd
 	systemctl
 
 if HAVE_GTK