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 /usr.sbin | |
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
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
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 |