diff options
author | gjb <gjb@FreeBSD.org> | 2013-12-23 21:58:03 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2013-12-23 21:58:03 +0000 |
commit | 1c629a8317b4eec23f4fd1b14b9fca7a8062462f (patch) | |
tree | 1b58d58c6d1d7a5508a03de0cf218436275883cf /release | |
parent | 62d693e2d0d6d39910faf2daef7963de712014d1 (diff) | |
download | FreeBSD-src-1c629a8317b4eec23f4fd1b14b9fca7a8062462f.zip FreeBSD-src-1c629a8317b4eec23f4fd1b14b9fca7a8062462f.tar.gz |
Remove references to SUP_UPDATE and CVS_UPDATE.
Include base svn when evaluating if svn(1) exists.
MFC after: 3-days
X-MFC-to: stable/10 only
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r-- | release/doc/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/release/doc/Makefile b/release/doc/Makefile index 99a8fab..75bc4fd 100644 --- a/release/doc/Makefile +++ b/release/doc/Makefile @@ -12,31 +12,27 @@ SUBDIR+= share/xml RELN_ROOT?= ${.CURDIR} +.if exists(/usr/local/bin/svn) SVN?= /usr/local/bin/svn +.elif exists(/usr/bin/svn) +SVN?= /usr/bin/svn +.else +SVN?= /usr/bin/svnlite +.endif + SVNFLAGS?= -r HEAD 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 !exists(${SVN}) +.if !exists(${SVN}) @echo "--------------------------------------------------------------" @echo ">>> Updating ${RELN_ROOT} requires ${SVN}." @echo "--------------------------------------------------------------" @exit 1 -. endif +.endif @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} using Subversion" + @echo ">>> Updating ${.CURDIR}" @echo "--------------------------------------------------------------" @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) -.else - @echo "Error: Please define SVN_UPDATE first." -.endif .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.subdir.mk" |