diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:37:43 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:37:43 +0000 |
| commit | 8f26887dfbbe6f1237d94a1e4915e3d33e6f0316 (patch) | |
| tree | 4d627eb35c91e6981860a5d1f476f41991a79818 /usr.sbin/Makefile | |
| parent | a85228f164a9f42b1ebf59565df68a78e20a2f78 (diff) | |
| download | src-8f26887dfbbe6f1237d94a1e4915e3d33e6f0316.tar.gz src-8f26887dfbbe6f1237d94a1e4915e3d33e6f0316.zip | |
Merge from CheriBSD:
commit 2d581e8caf79d7a0f5a24590eccd06da90cccb74
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Mon Jan 27 22:57:51 2014 +0000
Add WITHOUT_FMTREE to disable building fmtree.
MFC after: 4 weeks
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=261299
Diffstat (limited to 'usr.sbin/Makefile')
| -rw-r--r-- | usr.sbin/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 730495bf37b7..c3f93ccb7a1f 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -48,7 +48,7 @@ SUBDIR= adduser \ mountd \ mptutil \ mtest \ - mtree \ + ${_mtree} \ newsyslog \ nfscbd \ nfsd \ @@ -142,6 +142,10 @@ SUBDIR+= fdread SUBDIR+= fdwrite .endif +.if ${MK_FMTREE} != "no" +SUBDIR+= mtree +.endif + .if ${MK_FREEBSD_UPDATE} != "no" SUBDIR+= freebsd-update .endif |