diff options
| author | agc <agc> | 1997-08-20 16:02:48 +0000 |
|---|---|---|
| committer | agc <agc> | 1997-08-20 16:02:48 +0000 |
| commit | cb96b74c46d7b0b75fa6d4d09b0df069c46388a7 (patch) | |
| tree | 2b15c39cb0e27564c63fc16c9089ece8dac2e66f /mk | |
| parent | 407c42bc86cfe8c51a556fcc056c56f7c818c21a (diff) | |
| download | pkgsrc-cb96b74c46d7b0b75fa6d4d09b0df069c46388a7.tar.gz | |
Don't assume we're on NetBSD when setting LOCALBASE i.e.
test the OSNAME first.
Change the name of the mtree file to match NetBSD's.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 87ff6959acd..e6cfd479325 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.pkg.mk,v 1.2 1997/08/20 10:50:26 agc Exp $ +# $NetBSD: bsd.pkg.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 diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index b7210af0a9b..3b4e7a785d4 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -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 |