diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-08 11:38:21 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-08 11:38:21 +0100 |
| commit | 963a38d0b1eb17abadc5e83028f861b1c2be8d8a (patch) | |
| tree | 69f4667f6b630b96684fc5ef97b63b17aedb2c41 | |
| parent | a09de5c004b8943456ea686e5e9d38fabade5834 (diff) | |
| parent | 73e259322de5d4e46bbac8113ab5dcb38c69dd94 (diff) | |
| download | dbus-963a38d0b1eb17abadc5e83028f861b1c2be8d8a.tar.gz | |
Merge branch 'dbus-1.4'
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | bus/Makefile.am | 10 |
2 files changed, 9 insertions, 4 deletions
@@ -12,6 +12,9 @@ Changes: • Use #!/bin/sh for run-with-tmp-session-bus.sh, making it work on *BSD (fd.o #35880, Timothy Redaelli) +• Use ln -fs to set up dbus for systemd, which should fix reinstallation + when not using a DESTDIR (fd.o #37870, Simon McVittie) + • Windows-specific changes: · don't try to build dbus-daemon-launch-helper (fd.o #37838, Mark Brand) diff --git a/bus/Makefile.am b/bus/Makefile.am index bb895e2a..9761c27c 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -204,14 +204,16 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services if HAVE_SYSTEMD -# Install dbus.socket as default implementation of a D-Bus stack +# Install dbus.socket as default implementation of a D-Bus stack. +# Deliberately not using $(LN_S) here: ln -fs is not universally portable, +# but neither is systemd, so it's OK to assume here that ln complies with SUS. $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants - $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket + ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket # Unconditionally enable D-Bus on systemd installations $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants - $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket + ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants - $(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service + ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service endif if DBUS_UNIX |