Re: svn commit: r1495329 - /subversion/trunk/Makefile.in

Daniel Shahaf <danielsh_at_elego.de> writes:

>> --- subversion/trunk/Makefile.in (original)
>> +++ subversion/trunk/Makefile.in Fri Jun 21 08:35:37 2013
>> @@ -912,5 +912,5 @@ INSTALL_EXTRA_TOOLS=\
>> test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
>> ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
>> if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
>> - ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
>> + ln -sf ../svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
>
> Shouldn't this read:
>> + ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
> ? Otherwise, if someone changes 'toolsdir' or 'bindir', or makes
> 'svn-tools' a symlink, the symlink would be wrong or dangling.

Change in what way? The user can configure a different bindir but
toolsdir is hardcoded as bindir/svn-tools. There is no way for a user
to change toolsdir to something other than bindir/svn-tools. If we
change the hardcoded svn-tools subdir then the symlink will break but I
don't think that matters. The real solution is for the svn-tools subdir
to go away and for install-tools to install the tools into bindir. Why
did we ever think a subdir of bindir was a good idea?

I suppose the user could set up a symlink for bindir/svn-tools before
running 'make install-tools', but the most likely symlink would be to
bindir itself and then no symlink is possible.

-- 
Philip Martin | Subversion Committer
WANdisco | Non-Stop Data
www.wandisco.com