diff options
author | ru <ru@FreeBSD.org> | 2006-11-11 23:18:28 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-11-11 23:18:28 +0000 |
commit | 00ea8ac1d7fc9fb6d52feb7cce3cfbe56fb7c2a6 (patch) | |
tree | 12e4bf8401afaec136674daeb663bd5b8a34fd80 | |
parent | fb5651e047ba819adc96c9f9e76b4559123edf34 (diff) | |
download | FreeBSD-src-00ea8ac1d7fc9fb6d52feb7cce3cfbe56fb7c2a6.zip FreeBSD-src-00ea8ac1d7fc9fb6d52feb7cce3cfbe56fb7c2a6.tar.gz |
Enforce RELEASENOUPDATE if EXTSRCDIR is used.
Suggested by: jb
-rw-r--r-- | release/Makefile | 2 | ||||
-rw-r--r-- | share/man/man7/release.7 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 22289e1..f894c37 100644 --- a/release/Makefile +++ b/release/Makefile @@ -420,7 +420,7 @@ release rerelease: .endif .endif .if make(rerelease) -.if !defined(RELEASENOUPDATE) +.if !defined(RELEASENOUPDATE) && !defined(EXTSRCDIR) .if !defined(RELEASETAG) cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \ update ${CVSCMDARGS} -P -d -A diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 56e7778..a026db5 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 14, 2006 +.Dd November 12, 2006 .Dt RELEASE 7 .Os .Sh NAME @@ -291,7 +291,7 @@ The directory specified by this variable will be copied into .Pa ${CHROOTDIR}/usr/doc . For .Dq Li "rerelease" , -this will NOT be copied; cvs update will be used instead. +this will NOT be copied again. .It Va EXTPORTSDIR The directory specified by this variable will be copied into .Pa ${CHROOTDIR}/usr/ports . |