diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-30 11:51:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-30 11:51:52 -0400 |
| commit | 2bd52fb107528d459dabd5929794987c01a7270e (patch) | |
| tree | e01842ceb4617c06dee673c2a09dd4707ae33ab8 /src/grp-system/systemctl | |
| parent | 1ed649627c5dbf9254f325c8254bfa69c31466c9 (diff) | |
stuff
Diffstat (limited to 'src/grp-system/systemctl')
| -rw-r--r-- | src/grp-system/systemctl/Makefile | 4 | ||||
| -rw-r--r-- | src/grp-system/systemctl/systemctl.c | 32 |
2 files changed, 20 insertions, 16 deletions
diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile index 24585cc12b..43269c66c7 100644 --- a/src/grp-system/systemctl/Makefile +++ b/src/grp-system/systemctl/Makefile @@ -30,4 +30,8 @@ systemctl_SOURCES = \ systemctl_LDADD = \ libshared.la +systemd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" +systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c index b9b1c8400b..0808ecafe3 100644 --- a/src/grp-system/systemctl/systemctl.c +++ b/src/grp-system/systemctl/systemctl.c @@ -36,16 +36,8 @@ #include <systemd/sd-login.h> #include "basic/alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "bus-message.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/cgroup-show.h" #include "basic/cgroup-util.h" #include "basic/copy.h" -#include "shared/dropin.h" -#include "shared/efivars.h" #include "basic/env-util.h" #include "basic/exit-status.h" #include "basic/fd-util.h" @@ -54,26 +46,19 @@ #include "basic/fs-util.h" #include "basic/glob-util.h" #include "basic/hostname-util.h" -#include "shared/initreq.h" -#include "shared/install.h" #include "basic/io-util.h" #include "basic/list.h" #include "basic/locale-util.h" #include "basic/log.h" -#include "shared/logs-show.h" #include "basic/macro.h" #include "basic/mkdir.h" -#include "shared/pager.h" #include "basic/parse-util.h" -#include "shared/path-lookup.h" #include "basic/path-util.h" #include "basic/process-util.h" #include "basic/rlimit-util.h" #include "basic/set.h" #include "basic/signal-util.h" #include "basic/socket-util.h" -#include "shared/spawn-ask-password-agent.h" -#include "shared/spawn-polkit-agent.h" #include "basic/special.h" #include "basic/stat-util.h" #include "basic/strv.h" @@ -81,9 +66,24 @@ #include "basic/unit-name.h" #include "basic/user-util.h" #include "basic/util.h" -#include "shared/utmp-wtmp.h" #include "basic/verbs.h" #include "basic/virt.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-message.h" +#include "shared/bus-unit-util.h" +#include "shared/bus-util.h" +#include "shared/cgroup-show.h" +#include "shared/dropin.h" +#include "shared/efivars.h" +#include "shared/initreq.h" +#include "shared/install.h" +#include "shared/logs-show.h" +#include "shared/pager.h" +#include "shared/path-lookup.h" +#include "shared/spawn-ask-password-agent.h" +#include "shared/spawn-polkit-agent.h" +#include "shared/utmp-wtmp.h" static char **arg_types = NULL; static char **arg_states = NULL; |