diff options
| author | asomers <asomers@FreeBSD.org> | 2014-09-10 19:00:17 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2014-09-10 19:00:17 +0000 |
| commit | aebc4f8d529a641a163ce5ca7ae957d16b74588c (patch) | |
| tree | 198cf803ffd6d0a182d5e8f93941daf57c36d78d /tools | |
| parent | 1576b695b6af7e812a76f08eaf9ff60baabeeafd (diff) | |
| download | FreeBSD-src-aebc4f8d529a641a163ce5ca7ae957d16b74588c.zip FreeBSD-src-aebc4f8d529a641a163ce5ca7ae957d16b74588c.tar.gz | |
Conditionalize build of etcupdate(8) on MK_RCS. Since etcupdate calls
merge(1), which is part of the RCS package, it must not be installed if
WITHOUT_RCS update is set. Otherwise, it will produce confusing errors.
CR: https://reviews.freebsd.org/D691
MFC after: 1 week
Sponsored by: Spectra Logic
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_RCS | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 78878c2..5465cb7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3797,6 +3797,7 @@ OLD_FILES+=usr/bin/rcsdiff OLD_FILES+=usr/bin/rcsfreeze OLD_FILES+=usr/bin/rcsmerge OLD_FILES+=usr/bin/rlog +OLD_FILES+=usr/sbin/etcupdate OLD_FILES+=usr/share/man/man1/ci.1.gz OLD_FILES+=usr/share/man/man1/co.1.gz OLD_FILES+=usr/share/man/man1/ident.1.gz @@ -3809,6 +3810,7 @@ OLD_FILES+=usr/share/man/man1/rcsintro.1.gz OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz OLD_FILES+=usr/share/man/man1/rlog.1.gz OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +OLD_FILES+=usr/share/man/man8/etcupdate.8.gz .endif #.if ${MK_RESCUE} == no diff --git a/tools/build/options/WITHOUT_RCS b/tools/build/options/WITHOUT_RCS index 2a4ddec..e21e027 100644 --- a/tools/build/options/WITHOUT_RCS +++ b/tools/build/options/WITHOUT_RCS @@ -1,4 +1,6 @@ .\" $FreeBSD$ Set to not build .Xr rcs 1 -and related utilities. +, +.Xr etcupdate 8 +, and related utilities. |
