diff options
| author | Steve Wills <swills@FreeBSD.org> | 2016-04-13 01:47:04 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2016-04-13 01:47:04 +0000 |
| commit | d13c461400e89224ca649953588ae90d6f55dd36 (patch) | |
| tree | 127bbdb0141af49797f4eb974656a6b10ae1445b /Makefile.inc1 | |
| parent | 86aba0f2937bc77b7c6e0a0662d762d41cb31175 (diff) | |
| download | src-test2-d13c461400e89224ca649953588ae90d6f55dd36.tar.gz src-test2-d13c461400e89224ca649953588ae90d6f55dd36.zip | |
Try harder to find svn
While here, elliminate last references to CVS_UPDATE and SUP_UPDATE
Reviewed by: gjb
Approved by: gjb
Notes
Notes:
svn path=/head/; revision=297902
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 01566508cac9..648475b98618 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 MAKEOBJDIRPREFIX?= /usr/obj @@ -1210,13 +1218,6 @@ doxygen: .PHONY # latest copy. # 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) @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} using Subversion" |