chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c4a307
)
build-sys: move systemd from /sbin to /bin since it should be used by normal users...
author
Lennart Poettering
<lennart@poettering.net>
Tue, 1 Jun 2010 22:40:10 +0000
(
00:40
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 1 Jun 2010 22:40:10 +0000
(
00:40
+0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 5f880afe0045be08336c09f36474bd39b456152f..f5c43da5e2311a3b10c5ba8d2a65b4eb52d2538e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-28,7
+28,6
@@
sessionunitdir=$(pkgdatadir)/session
# And these are the special ones for /
rootdir=@rootdir@
# And these are the special ones for /
rootdir=@rootdir@
-rootsbindir=$(rootdir)/sbin
rootbindir=$(rootdir)/bin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
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\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
- -DSYSTEMD_BINARY_PATH=\"$(root
s
bindir)/systemd\" \
+ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-I $(top_srcdir)/src
-I $(top_srcdir)/src
-rootsbin_PROGRAMS = \
- systemd
-
rootbin_PROGRAMS = \
rootbin_PROGRAMS = \
+ systemd
systemctl
if HAVE_GTK
systemctl
if HAVE_GTK