chiark / gitweb /
build-sys: move systemd from /sbin to /bin since it should be used by normal users...
authorLennart Poettering <lennart@poettering.net>
Tue, 1 Jun 2010 22:40:10 +0000 (00:40 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 1 Jun 2010 22:40:10 +0000 (00:40 +0200)
Makefile.am

index 5f880af..f5c43da 100644 (file)
@@ -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