aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2004-12-30 23:56:13 +0000
committerKris Kennaway <kris@FreeBSD.org>2004-12-30 23:56:13 +0000
commit71da5b35cf8a0f82cad92980a1aea1ededb3c616 (patch)
tree923959b4921c82d9ca245bb46d8b47febc1ef2a7 /Mk
parent6ce928657eab6d20470b921c9853ee1e68d2cae1 (diff)
downloadports-71da5b35cf8a0f82cad92980a1aea1ededb3c616.tar.gz
ports-71da5b35cf8a0f82cad92980a1aea1ededb3c616.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index f6396ed5caba..e3fa92c6765f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1884,20 +1884,18 @@ EXTRACT_CMD?= ${GZIP_CMD}
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} == ${X11BASE}
+.if ${PREFIX} == ${X11BASE} || defined(USE_X_PREFIX)
+# User may have specified non-standard PREFIX for installing a port that
+# uses X
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.endif
-.else
-.if ${PREFIX} == ${LOCALBASE}
-MTREE_FILE= /etc/mtree/BSD.local.dist
.elif ${PREFIX} == /usr
MTREE_FILE= /etc/mtree/BSD.usr.dist
.else
-NO_MTREE= yes # Can't figure out prefix, assume nonstandard
-.endif
+MTREE_FILE= /etc/mtree/BSD.local.dist
.endif
.endif
MTREE_CMD?= /usr/sbin/mtree