Date: Tue, 12 Apr 2016 19:59:15 -0600 From: Ian Lepore <ian@freebsd.org> To: Steve Wills <swills@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r297902 - head Message-ID: <1460512755.52955.18.camel@freebsd.org> In-Reply-To: <201604130147.u3D1l5F0032629@repo.freebsd.org> References: <201604130147.u3D1l5F0032629@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 2016-04-13 at 01:47 +0000, Steve Wills wrote: > Author: swills (ports committer) > Date: Wed Apr 13 01:47:04 2016 > New Revision: 297902 > URL: https://svnweb.freebsd.org/changeset/base/297902 > > Log: > Try harder to find svn > > While here, elliminate last references to CVS_UPDATE and SUP_UPDATE > > Reviewed by: gjb > Approved by: gjb > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ===================================================================== > ========= > --- head/Makefile.inc1 Wed Apr 13 01:46:48 2016 (r29790 > 1) > +++ head/Makefile.inc1 Wed Apr 13 01:47:04 2016 (r29790 > 2) > @@ -153,7 +153,15 @@ BUILDENV_SHELL?=${SHELL} > BUILDENV_SHELL?=/bin/sh > .endif > > -SVN?= /usr/local/bin/svn > +.if !defined(SVN) || empty(SVN) > +. for _P in /usr/bin /usr/local/bin > +. for _S in svn svnlite > +. if exists(${_P}/${_S}) > +SVN= ${_P}/${_S} > +. endif > +. endfor > +. endfor > +.endif > SVNFLAGS?= -r HEAD > More succinctly: .if empty(SVN) SVN!= which svn || which svnlite .endif -- Ian
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1460512755.52955.18.camel>