Re: [PATCH 1/2] Makefile: Use the same source directory for "ln -s" as for "ln" / "cp"

From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Feb 5, 2015, 20:29 UTC
Message-ID: <CAHGBnuPL7NN9J+4xd7xifsmbSPcC5V2ze05ji7P_qnvWHPGV+A@mail.gmail.com>
In-Reply-To: <20150205195143.GB15326@peff.net>

On Thu, Feb 5, 2015 at 8:51 PM, Jeff King <peff@peff.net> wrote:

Show 13 quoted lines

> On Thu, Feb 05, 2015 at 08:26:08PM +0100, Sebastian Schuberth wrote:
>
>> > It is not even correct, is it?
>> >
>> > When DESTDIR is set to allow you to install into a temporary place
>> > only so that you can "tar" up the resulting filesystem tree, bindir
>> > points at the location we need to "cp" the built programs into, i.e.
>> > inside DESTDIR.
>>
>> Agreed folks, please disregard this as well as 2/2 of this series.
>
> We would still want an equivalent to 2/2 to set up a relative symlink
> for $(ALL_PROGRAMS), though, right?

Probably. But I'm not sure how to calculate the relative path correctly so that it'll work with all possible bin / execdir combinations. A simple

diff --git a/Makefile b/Makefile
index 21f23cb..d2849c3 100644

--- a/Makefile
+++ b/Makefile

@@ -2258,8 +2258,8 @@

 endif
 ········$(RM)·"$$execdir/$$p"·&&·\
 ········test·-z·"$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)"·&&·\
 ········ln·"$$bindir/$$p"·"$$execdir/$$p"·2>/dev/null·||·\
+········ln·-s·"../$$p"·"$$execdir/$$p"·2>/dev/null·||·\
 ········cp·"$$bindir/$$p"·"$$execdir/$$p"·||·exit;·\
 ······done;·\
 ····}·&&·\
--·

does not seem to be correct in all cases.

-- 
Sebastian Schuberth