Date: Tue, 20 Feb 2018 22:03:04 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329678 - head Message-ID: <201802202203.w1KM34mM003765@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Feb 20 22:03:04 2018 New Revision: 329678 URL: https://svnweb.freebsd.org/changeset/base/329678 Log: Only lookup SVN once and rename to SVN_CMD. MFC after: 2 weeks Sponsored by: Dell EMC Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 20 21:53:39 2018 (r329677) +++ head/Makefile.inc1 Tue Feb 20 22:03:04 2018 (r329678) @@ -339,14 +339,15 @@ BUILDENV_SHELL?=${SHELL} BUILDENV_SHELL?=/bin/sh .endif -.if !defined(SVN) || empty(SVN) +.if !defined(SVN_CMD) || empty(SVN_CMD) . for _P in /usr/bin /usr/local/bin . for _S in svn svnlite . if exists(${_P}/${_S}) -SVN= ${_P}/${_S} +SVN_CMD= ${_P}/${_S} . endif . endfor . endfor +.export SVN_CMD .endif SVNFLAGS?= -r HEAD .if !defined(VCS_REVISION) && empty(VCS_REVISION) @@ -1794,7 +1795,7 @@ update: .PHONY @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} using Subversion" @echo "--------------------------------------------------------------" - @(cd ${.CURDIR}; ${SVN} update ${SVNFLAGS}) + @(cd ${.CURDIR}; ${SVN_CMD} update ${SVNFLAGS}) .endif #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802202203.w1KM34mM003765>