diff options
| author | gjb <gjb@FreeBSD.org> | 2016-04-13 02:04:09 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-04-13 02:04:09 +0000 |
| commit | cad5e8d3bce52708ae6b253a4427d56b4befd46c (patch) | |
| tree | 92bbcf5b84bdd150282eaf6ec82e328e0e517eca /Makefile.inc1 | |
| parent | 2d6ac6ea572ca93a1ff4e32936214246cc9b2551 (diff) | |
| parent | 5c3b3f706fae5bed563c4681b89e06b1a2860417 (diff) | |
| download | FreeBSD-src-cad5e8d3bce52708ae6b253a4427d56b4befd46c.zip FreeBSD-src-cad5e8d3bce52708ae6b253a4427d56b4befd46c.tar.gz | |
MFH
Sponsored by: The FreeBSD Foundation
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 fb5ea48..1ce1362 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 @@ -1388,13 +1396,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" |
