diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-07 14:01:39 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-08 11:33:21 +0100 |
| commit | 3b82500b1b768d880100ed5ea98afcac26286257 (patch) | |
| tree | 258b3209efd0690cc4091566526ebf525d6ff9a0 /bus | |
| parent | f0d4e0fc974e642f54aaf58907db8d5284d9013d (diff) | |
bus: use ln -fs to enable dbus in systemd, not $(LN_S)
Using $(LN_S) is inappropriate because it could in theory mean either
ln -s, ln or cp -p depending on autoconf checks.
Not using -f breaks reinstallation directly from source (DESTDIR unset),
because the symlinks will already exist.
Because systemd isn't currently portable to non-Linux, let alone
non-SUS-compliant systems, it seems safe to assume that ln -fs behaves
as specified by SUS if systemd was found.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37870
Reviewed-by: Colin Walters <walters@verbum.org>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
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 |