You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alexander Thomas <al...@collab.net> on 2013/02/11 12:47:28 UTC
[PATCH] Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
All,
This originated from one of my requirement where svn* binaries and tools
need to be installed in same location.
I'm not sure this one qualifies as a valid patch, because for this to
happen someone should tweaks Makefile.in
and points $bindir and $toolsdir to same location.
[[[
Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
* Makefile.in
(INSTALL_EXTRA_TOOLS): Check that target and link_name are not the
same before creating symlink to svnmucc in BINDIR.
Patch by: Alexander Thomas <alexander{_AT_}collab.net>
]]]
Thanks
-Alexander Thomas (AT)
Re: [PATCH] Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
Posted by Julian Foad <ju...@btopenworld.com>.
I (Julian Foad) wrote on 2013-02-11:
> Alexander Thomas wrote:
>> This originated from one of my requirement where svn* binaries and
>> tools need to be installed in same location. I'm not sure this one
>> qualifies as a valid patch, because for this to happen someone
>> should tweaks Makefile.in and points $bindir and $toolsdir to same
>> location.
>
> I think this is fine and we should apply it. I'm having trouble
> testing it at the moment because 'make install-tools' is failing for
> me at an earlier stage, but the patch looks fine as far as I can see.
Thanks for the (private) reminder. I still haven't tested this myself, but I committed it anyway in r1446686.
- Julian
>> [[[
>> Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
>>
>> * Makefile.in
>> (INSTALL_EXTRA_TOOLS): Check that target and link_name are not the
>> same before creating symlink to svnmucc in BINDIR.
>>
>> Patch by: Alexander Thomas <alexander{_AT_}collab.net>
>> ]]]
>
> (For quick reference, the patch is basically this, in Makefile.in:)
> + if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)";
> then \
> ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT)
> $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
> + fi
>
RE: [PATCH] Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
Posted by Gavin Baumanis <ga...@thespidernet.com>.
Ping.
Just thought I would bring this back - as I havent noticed a commit
response.
Gavin.
> -----Original Message-----
> From: Julian Foad [mailto:julianfoad@btopenworld.com]
> Sent: Monday, 11 February 2013 08:54
> To: Alexander Thomas
> Cc: dev@subversion.apache.org
> Subject: Re: [PATCH] Don't break 'make install-tools' if TOOLSDIR is same
as
> BINDIR.
>
> Alexander Thomas wrote:
> > This originated from one of my requirement where svn* binaries and
> > tools need to be installed in same location.
> > I'm not sure this one qualifies as a valid patch, because for this to
> > happen someone should tweaks Makefile.in and points $bindir and
> > $toolsdir to same location.
>
> I think this is fine and we should apply it. I'm having trouble testing
it at the
> moment because 'make install-tools' is failing for me at an earlier stage,
but
> the patch looks fine as far as I can see.
>
> - Julian
>
>
> > [[[
> > Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
> >
> > * Makefile.in
> > (INSTALL_EXTRA_TOOLS): Check that target and link_name are not the
> > same before creating symlink to svnmucc in BINDIR.
> >
> > Patch by: Alexander Thomas <alexander{_AT_}collab.net> ]]]
>
> (For quick reference, the patch is basically this, in Makefile.in:)
> + if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
> ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT)
> $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
> + fi
Re: [PATCH] Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
Posted by Julian Foad <ju...@btopenworld.com>.
Alexander Thomas wrote:
> This originated from one of my requirement where svn* binaries and tools need to
> be installed in same location.
> I'm not sure this one qualifies as a valid patch, because for this to happen
> someone should tweaks Makefile.in
> and points $bindir and $toolsdir to same location.
I think this is fine and we should apply it. I'm having trouble testing it at the moment because 'make install-tools' is failing for me at an earlier stage, but the patch looks fine as far as I can see.
- Julian
> [[[
> Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.
>
> * Makefile.in
> (INSTALL_EXTRA_TOOLS): Check that target and link_name are not the
> same before creating symlink to svnmucc in BINDIR.
>
> Patch by: Alexander Thomas <alexander{_AT_}collab.net>
> ]]]
(For quick reference, the patch is basically this, in Makefile.in:)
+ if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ fi