diff options
Diffstat (limited to 'rules/dbus.make')
| -rw-r--r-- | rules/dbus.make | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/rules/dbus.make b/rules/dbus.make index fc5f4f390..5b32f8f61 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -63,8 +63,7 @@ DBUS_AUTOCONF := \ --disable-kqueue \ --disable-console-owner-file \ --disable-userdb-cache \ - --with-dbus-user=$(PTXCONF_DBUS_USER) \ - --with-systemdsystemunitdir=/usr/share/dbus-1/system-services + --with-dbus-user=$(PTXCONF_DBUS_USER) ifdef PTXCONF_DBUS_XML_EXPAT DBUS_AUTOCONF += --with-xml=expat @@ -85,6 +84,12 @@ else DBUS_AUTOCONF += --without-x endif +ifdef PTXCONF_DBUS_SYSTEMD_UNIT +DBUS_AUTOCONF += --with-systemdsystemunitdir=/lib/systemd/system +else +DBUS_AUTOCONF += --without-systemdsystemunitdir +endif + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -161,6 +166,19 @@ ifneq ($(call remove_quotes,$(PTXCONF_DBUS_BBINIT_LINK)),) endif endif endif +ifdef PTXCONF_DBUS_SYSTEMD_UNIT + @$(call install_copy, dbus, 0, 0, 0644, -, \ + /lib/systemd/system/dbus.socket) + @$(call install_link, dbus, ../dbus.socket, \ + /lib/systemd/system/sockets.target.wants/dbus.socket) + @$(call install_link, dbus, ../dbus.socket, \ + /lib/systemd/system/dbus.target.wants/dbus.socket) + + @$(call install_copy, dbus, 0, 0, 0644, -, \ + /lib/systemd/system/dbus.service) + @$(call install_link, dbus, ../dbus.service, \ + /lib/systemd/system/multi-user.target.wants/dbus.service) +endif ifdef PTXCONF_INITMETHOD_UPSTART ifdef PTXCONF_DBUS_STARTSCRIPT |