summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1995-06-25 06:30:51 +0000
committerasami <asami@FreeBSD.org>1995-06-25 06:30:51 +0000
commit2f4a3ba54808b6484875da2ea703df91750828cc (patch)
tree952d560cef56839f61833d1f11c5b22178d315b9 /share
parent6b1a9bd0a208572c2190096ef3d2313543e17732 (diff)
downloadFreeBSD-src-2f4a3ba54808b6484875da2ea703df91750828cc.zip
FreeBSD-src-2f4a3ba54808b6484875da2ea703df91750828cc.tar.gz
Add new option NO_MTREE. If set, bsd.port.mk won't run mtree to
set permissions and ownerships of PREFIX (usually /usr/local). This is the default if USE_IMAKE or USE_X11 is set. This should be useful for machines like thud, where we want to keep the /usr/local subtree writable to a group ("ports" in our case). Anybody who installs stuff in /usr/local should have this set in the environment. Note this won't affect anything the pkg_* suite does.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.port.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 76f2561..d75bc11 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -3,7 +3,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
-# $Id: bsd.port.mk,v 1.165 1995/06/06 10:56:34 asami Exp $
+# $Id: bsd.port.mk,v 1.166 1995/06/24 10:27:23 asami Exp $
#
# Please view me with 4 column tabs!
@@ -74,6 +74,9 @@
# PKG_DBDIR - Where package installation is recorded (default: /var/db/pkg)
# FORCE_PKG_REGISTER - If set, it will overwrite any existing package
# registration information in ${PKG_DBDIR}/${PKGNAME}.
+# NO_MTREE - If set, will not invoke mtree from bsd.port.mk from
+# the "install" target. This is the default if
+# USE_IMAKE or USE_X11 is set.
#
# NO_EXTRACT - Use a dummy (do-nothing) extract target.
# NO_CONFIGURE - Use a dummy (do-nothing) configure target.
@@ -251,6 +254,9 @@ MTREE_LOCAL= /etc/mtree/BSD.local.dist
.endif
MTREE_CMD?= mtree
MTREE_ARGS?= -U -f ${MTREE_LOCAL} -d -e -p
+.if defined(USE_X11) || defined(USE_IMAKE) || !defined(MTREE_LOCAL)
+NO_MTREE= yes
+.endif
# The user can override the NO_PACKAGE by specifying this from
# the make command line
@@ -768,7 +774,7 @@ install: build ${INSTALL_COOKIE}
${INSTALL_COOKIE}:
@${ECHO_MSG} "===> Installing for ${PKGNAME}"
-.if !defined(USE_X11) && !defined(USE_IMAKE) && defined(MTREE_LOCAL)
+.if !defined(NO_MTREE)
@${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/;
.endif
.if target(pre-install)
OpenPOWER on IntegriCloud