diff options
author | Alan Somers <asomers@FreeBSD.org> | 2014-09-10 19:00:17 +0000 |
---|---|---|
committer | Alan Somers <asomers@FreeBSD.org> | 2014-09-10 19:00:17 +0000 |
commit | cec2add46f4d8496e5a15998fec7a4827a45062a (patch) | |
tree | 198cf803ffd6d0a182d5e8f93941daf57c36d78d /usr.sbin/Makefile | |
parent | 028bdf289df048af19dd5d599114dff27afc36c5 (diff) | |
download | src-cec2add46f4d8496e5a15998fec7a4827a45062a.tar.gz src-cec2add46f4d8496e5a15998fec7a4827a45062a.zip |
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
Notes
Notes:
svn path=/head/; revision=271401
Diffstat (limited to 'usr.sbin/Makefile')
-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 f4c51d2e7a60..b0cff950bf2b 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -26,7 +26,6 @@ SUBDIR= adduser \ digictl \ diskinfo \ dumpcis \ - etcupdate \ extattr \ extattrctl \ fifolog \ @@ -278,6 +277,10 @@ SUBDIR+= repquota SUBDIR+= rwhod .endif +.if ${MK_RCS} != "no" +SUBDIR+= etcupdate +.endif + .if ${MK_SENDMAIL} != "no" SUBDIR+= editmap SUBDIR+= mailstats |