diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:38:01 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:38:01 +0000 |
| commit | 02371f01af9e407a8c9a5d07d0166ad4383e37cf (patch) | |
| tree | 0d99ed01a0460d19b48af2a9705aa0e37458f939 /mk/bsd.prefs.mk | |
| parent | aefcbc08415c6554b9a3fce15aab450a7295e771 (diff) | |
| download | pkgsrc-02371f01af9e407a8c9a5d07d0166ad4383e37cf.tar.gz | |
Only assign X11BASE=/usr/X11R6 if X11_TYPE was not defined, or
if X11_TYPE == native (by default).
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index f1afe829d53..8f78a5a39a7 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.162 2004/07/06 22:49:16 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.163 2004/07/30 07:38:01 xtraeme Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -309,11 +309,11 @@ USE_INET6= NO LOCALBASE?= ${DESTDIR}/usr/pkg .if ${OPSYS} == "SunOS" # On Solaris, we default to using OpenWindows for X11. -X11BASE?= ${DESTDIR}/usr/openwin -.else -X11BASE?= ${DESTDIR}/usr/X11R6 +X11BASE?= ${DESTDIR}/usr/openwin +.elif !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative) +X11BASE?= ${DESTDIR}/usr/X11R6 .endif -CROSSBASE?= ${LOCALBASE}/cross +CROSSBASE?= ${LOCALBASE}/cross # If xpkgwedge.def is found, then clearly we're using xpkgwedge. .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ |