summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>1999-10-05 15:48:26 +0000
committerjlam <jlam>1999-10-05 15:48:26 +0000
commit1af0dce45f6e5148e7b1457e90ef1ca5cf0be83b (patch)
treeb25dd410b3d4c6fe1f0343a9fa3f0ad5fe09232f
parent71278a80137b14c07216ec4486d34a76db748eed (diff)
downloadpkgsrc-1af0dce45f6e5148e7b1457e90ef1ca5cf0be83b.tar.gz
New variable XPKGBASE automatically set to ${LOCALBASE} or ${X11BASE} based
on value of USE_LOCALBASE_FOR_X11. This points to the installation path of X11 packages built via pkgsrc.
-rw-r--r--mk/bsd.pkg.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index d4fe75e766d..308371cc4b3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.350 1999/10/04 17:13:02 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.351 1999/10/05 15:48:26 jlam Exp $
#
# This file is in the public domain.
#
@@ -75,12 +75,16 @@ 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}