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.
This commit is contained in:
parent
33dc7e1b84
commit
14e07b2241
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user