summaryrefslogtreecommitdiffstats
path: root/usr.sbin/Makefile
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2012-07-02 15:28:50 +0000
committerbapt <bapt@FreeBSD.org>2012-07-02 15:28:50 +0000
commit1903f68f13384640bd9d1f121ab7d94f0ef8c527 (patch)
treeeb67168c133607cc4dd4f75b6353d52e6bb12035 /usr.sbin/Makefile
parent180d34b93e2d4611ce0c747c39d1be10b217d19d (diff)
downloadFreeBSD-src-1903f68f13384640bd9d1f121ab7d94f0ef8c527.zip
FreeBSD-src-1903f68f13384640bd9d1f121ab7d94f0ef8c527.tar.gz
New build KNOB: WITHOUT_PKGBOOTSTRAP to condition building of usr.sbin/pkg
Do not condition usr.sbin/pkg building on WITHOUT_PKGTOOLS anymore, so that users can remove the old pkg_* tools without removing the pkgng boostrap Approved by: des (mentor) MFC after: 1 month
Diffstat (limited to 'usr.sbin/Makefile')
-rw-r--r--usr.sbin/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index ded1725..69dc01f 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -259,9 +259,12 @@ SUBDIR+= keyserv
SUBDIR+= ftp-proxy
.endif
+.if ${PK_PKGBOOTSTRAP} != "no"
+SUBDIR+= pkg
+.endif
+
.if ${MK_PKGTOOLS} != "no"
SUBDIR+= pkg_install
-SUBDIR+= pkg
.endif
# XXX MK_TOOLCHAIN?
OpenPOWER on IntegriCloud