mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-13 10:02:38 +00:00
Code Issues Releases Activity

Try harder to find svn

Browse Source 
While here, elliminate last references to CVS_UPDATE and SUP_UPDATE

Reviewed by:	gjb
Approved by:	gjb
This commit is contained in:
Steve Wills 2016-04-13 01:47:04 +00:00
parent 86aba0f293
commit d13c461400
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=297902
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.inc1
View File

@ -153,7 +153,15 @@ BUILDENV_SHELL?=${SHELL}
BUILDENV_SHELL?=/bin/sh BUILDENV_SHELL?=/bin/sh
.endif .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 SVNFLAGS?= -r HEAD
MAKEOBJDIRPREFIX?= /usr/obj MAKEOBJDIRPREFIX?= /usr/obj
@ -1210,13 +1218,6 @@ doxygen: .PHONY
# latest copy. # latest copy.
# #
update: update:
.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
@echo "--------------------------------------------------------------"
@echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
@echo "--------------------------------------------------------------"
@exit 1
.endif
.if defined(SVN_UPDATE) .if defined(SVN_UPDATE)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} using Subversion" @echo ">>> Updating ${.CURDIR} using Subversion"