[systemd-devel] [PATCH] Fix systemd-stdio-bridge symlink

[Michael Biebl]

2014-03-03 15:32 GMT+01:00 Lennart Poettering <lennart at poettering.net>:
> On Sun, 02.03.14 23:37, Mike Gilbert (floppym at gentoo.org) wrote:
>
>> The symlink is created in bindir (/usr/bin), and points to a binary
>> which lives in rootlibexecdir (/lib/systemd or /usr/lib/systemd). A
>> relative symlink does not work here.
>> ---
>>  Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 38445fb..e7134a2 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -1978,7 +1978,7 @@ systemd_bus_proxyd_LDADD = \
>>
>>  bus-proxyd-install-hook:
>>       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
>> -     $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
>> +     $(AM_V_LN)$(LN_S) -f $(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
>>
>>  bus-proxyd-uninstall-hook:
>>       rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
>
> This really sounds like we want to use ln's "--relative" option here, so
> that the symlink is relative regardless what the setup is.

The patch looked ok to me as is, but I can certainly add a --relative
if you prefer.

Should
dbus1-generator-install-hook:
       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
       $(AM_V_LN)$(LN_S) -f
$(systemgeneratordir)/systemd-dbus1-generator
$(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator

be updated then as well?


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?