diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-07 09:17:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:22:03 +0200 |
| commit | 34cd7efe933ed4cb938e1bf60c5d3fc8690e71e5 (patch) | |
| tree | b6a703924bd89473c30942c1f2fd7f6b9b50fe53 /rules/dbus.make | |
| parent | 772f828d04d2e66ca4531ee38bb3c84dd18cc4b4 (diff) | |
| download | ptxdist-34cd7efe933ed4cb938e1bf60c5d3fc8690e71e5.tar.gz ptxdist-34cd7efe933ed4cb938e1bf60c5d3fc8690e71e5.tar.xz | |
dbus: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dbus.make')
| -rw-r--r-- | rules/dbus.make | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/dbus.make b/rules/dbus.make index 91dc18b1d..5c971ecf2 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -65,7 +65,7 @@ DBUS_CONF_OPT := \ --$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \ --$(call ptx/wwo, PTXCONF_DBUS_X)-x$(call ptx/ifdef,PTXCONF_DBUS_X,=$(SYSROOT)/usr,) \ --without-valgrind \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-systemduserunitdir=/usr/lib/systemd/user # ---------------------------------------------------------------------------- @@ -123,16 +123,16 @@ endif endif ifdef PTXCONF_DBUS_SYSTEMD_UNIT @$(call install_copy, dbus, 0, 0, 0644, -, \ - /lib/systemd/system/dbus.socket) + /usr/lib/systemd/system/dbus.socket) @$(call install_link, dbus, ../dbus.socket, \ - /lib/systemd/system/sockets.target.wants/dbus.socket) + /usr/lib/systemd/system/sockets.target.wants/dbus.socket) @$(call install_link, dbus, ../dbus.socket, \ - /lib/systemd/system/dbus.target.wants/dbus.socket) + /usr/lib/systemd/system/dbus.target.wants/dbus.socket) @$(call install_copy, dbus, 0, 0, 0644, -, \ - /lib/systemd/system/dbus.service) + /usr/lib/systemd/system/dbus.service) @$(call install_link, dbus, ../dbus.service, \ - /lib/systemd/system/multi-user.target.wants/dbus.service) + /usr/lib/systemd/system/multi-user.target.wants/dbus.service) endif @$(call install_finish, dbus) |