[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Fri, 21 Jun 2013 13:29:37 +0300

philip_at_apache.org wrote on Fri, Jun 21, 2013 at 08:35:37 -0000:
> Author: philip
> Date: Fri Jun 21 08:35:37 2013
> New Revision: 1495329
>
> URL: http://svn.apache.org/r1495329
> Log:
> Fix the svnmucc symlink in svn-tools so it doesn't to link to DESTDIR.
> The user can configure $(bindir) but $(toolsdir) is always a subdir
> of that so a relative symlink should be OK.
>
> Found by: Nico Kadel-Garcia <nkadel{_AT_}gmail.com>
>
> * Makefile.in
> (INSTALL_EXTRA_TOOLS): Use a relative symlink.
>
> Modified:
> subversion/trunk/Makefile.in
>
> Modified: subversion/trunk/Makefile.in
> URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1495329&r1=1495328&r2=1495329&view=diff
> ==============================================================================
> --- 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.

Daniel

> fi
>
>
Received on 2013-06-21 12:31:12 CEST

This is an archived mail posted to the Subversion Dev mailing list.