From 0f8995a910292d7fa4ec3b32d65ffccf23ce9187 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 20 Feb 2018 22:03:04 +0000 Subject: [PATCH] Only lookup SVN once and rename to SVN_CMD. MFC after: 2 weeks Sponsored by: Dell EMC --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9c11ec9f38ca..2cf796ec22af 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 #