Only lookup SVN once and rename to SVN_CMD.
MFC after: 2 weeks Sponsored by: Dell EMC
This commit is contained in:
parent
c0d9f07d47
commit
0f8995a910
@ -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
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user