Author: gjb
Date: Mon Dec 23 21:58:03 2013
New Revision: 259792
URL: http://svnweb.freebsd.org/changeset/base/259792
Log:
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
Modified:
head/release/doc/Makefile
Modified: head/release/doc/Makefile
==============================================================================
--- head/release/doc/Makefile Mon Dec 23 21:55:54 2013 (r259791)
+++ head/release/doc/Makefile Mon Dec 23 21:58:03 2013 (r259792)
@@ -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"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
