Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume we're on NetBSD when setting LOCALBASE i.e.

Browse Source 
test the OSNAME first.

Change the name of the mtree file to match NetBSD's.
This commit is contained in:
agc 1997-08-20 16:02:48 +00:00
parent 44579dfa67
commit 0ee4409cbe
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/mk/bsd.port.mk
View File

@ -2,7 +2,7 @@
# ex:ts=4
#
# Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp
# $NetBSD: bsd.port.mk,v 1.2 1997/08/20 10:50:26 agc Exp $
# $NetBSD: bsd.port.mk,v 1.3 1997/08/20 16:02:48 agc Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -282,10 +282,11 @@ OPSYS!= uname -s
# by individual Makefiles or local system make configuration.
.if (${OPSYS} == "NetBSD")
PORTSDIR?= /usr/pkg/src
LOCALBASE?= ${DESTDIR}/usr/pkg
.else
PORTSDIR?= /usr/ports
LOCALBASE?= ${DESTDIR}/usr/local
.endif
LOCALBASE?= ${DESTDIR}/usr/pkg
X11BASE?= ${DESTDIR}/usr/X11R6
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
@ -444,9 +445,13 @@ EXTRACT_BEFORE_ARGS?= -xzf
.if defined(USE_IMAKE) || defined(USE_X11)
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
.if (${OPSYS} == "NetBSD")
MTREE_FILE= /etc/mtree/BSD.pkg.dist
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
.endif
.endif
.endif
MTREE_CMD?= /usr/sbin/mtree
MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p