diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-04-13 02:04:09 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-04-13 02:04:09 +0000 |
| commit | 9c831bbd699f824944cf3fcc4bcd49cca8bbff7e (patch) | |
| tree | 92bbcf5b84bdd150282eaf6ec82e328e0e517eca /Makefile.inc1 | |
| parent | a123f26e9290a4636e3a8d7ac10dbd000fc50f59 (diff) | |
| parent | 074e77e66eb40fe39c97f323b157c99e7e828750 (diff) | |
| download | src-9c831bbd699f824944cf3fcc4bcd49cca8bbff7e.tar.gz src-9c831bbd699f824944cf3fcc4bcd49cca8bbff7e.zip | |
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-pkg/; revision=297906
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 fb5ea48ba260..1ce13627a906 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" |