diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-15 18:01:05 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-15 18:01:05 +0000 |
| commit | 6d12e854a1505834a4033351822719e46e54dd23 (patch) | |
| tree | a133747d3e0ea5720371580ad341299c72ca5a5d | |
| parent | 73da3a2835e4c2509c09cad036ba1c10eb3e5fa7 (diff) | |
| download | FreeBSD-src-6d12e854a1505834a4033351822719e46e54dd23.zip FreeBSD-src-6d12e854a1505834a4033351822719e46e54dd23.tar.gz | |
MFC r271401:
r271401 (by asomers):
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
Sponsored by: Spectra Logic
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_RCS | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4361d08..f51e15e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4081,6 +4081,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 @@ -4093,6 +4094,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. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 81be708..57effb8 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -23,7 +23,6 @@ SUBDIR= adduser \ digictl \ diskinfo \ dumpcis \ - etcupdate \ extattr \ extattrctl \ fifolog \ @@ -302,6 +301,10 @@ SUBDIR+= repquota SUBDIR+= rwhod .endif +.if ${MK_RCS} != "no" +SUBDIR+= etcupdate +.endif + .if ${MK_SENDMAIL} != "no" SUBDIR+= editmap SUBDIR+= mailstats |
