diff options
| author | jlam <jlam> | 1999-10-07 16:04:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 1999-10-07 16:04:57 +0000 |
| commit | d6c2c1012d79ab224afea5f317057cfd0e224d60 (patch) | |
| tree | 7e07f12480448b14099ac48539d4a32c350a1314 | |
| parent | 7d8884d2e329b20b8c0adf43a4992266f6240e19 (diff) | |
| download | pkgsrc-d6c2c1012d79ab224afea5f317057cfd0e224d60.tar.gz | |
Back out revision 1.351 which added XPKGBASE. This seems to be an issue of
some contention, so better leave changes for till after all the dust
settles.
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b9e9739d2c8..c800bb25938 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.352 1999/10/05 22:18:05 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.353 1999/10/07 16:04:57 jlam Exp $ # # This file is in the public domain. # @@ -75,16 +75,12 @@ SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR}/pkg -.if defined(USE_LOCALBASE_FOR_X11) -XPKGBASE= ${LOCALBASE} -.else -XPKGBASE= ${X11BASE} -.endif - .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) -PREFIX= ${XPKGBASE} .if defined(USE_LOCALBASE_FOR_X11) +PREFIX= ${LOCALBASE} BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/xpkgwedge.def:${PKGSRCDIR}/pkgtools/xpkgwedge +.else +PREFIX= ${X11BASE} .endif .elif defined(USE_CROSSBASE) PREFIX= ${CROSSBASE} |