summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-02 00:40:10 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-02 00:40:10 +0200
commitf401faf540ee31740b4cd0a8b3d4038ea8c33092 (patch)
tree61c10ef7368f9b503e6baf17fd4bd558024b846e
parent8c4a3079a7f358c179430d1aec59de8b670b5f6e (diff)
build-sys: move systemd from /sbin to /bin since it should be used by normal users too, for session handling
-rw-r--r--Makefile.am7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 5f880afe00..f5c43da5e2 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