aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-07-02 15:28:50 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-07-02 15:28:50 +0000
commit2f3a9ba57f90bd221d4ee957d97ed3d945da1bd8 (patch)
treeeb67168c133607cc4dd4f75b6353d52e6bb12035 /usr.sbin
parent87e5ba0b547de4985cc2072806b8acb9bfae4577 (diff)
downloadsrc-2f3a9ba57f90bd221d4ee957d97ed3d945da1bd8.tar.gz
src-2f3a9ba57f90bd221d4ee957d97ed3d945da1bd8.zip
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
Notes
Notes: svn path=/head/; revision=237997
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index ded1725cb52d..69dc01f0bef2 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?