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 /usr.sbin | |
| 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 '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 f4c51d2..b0cff95 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 |
