diff options
| -rw-r--r-- | mk/bsd.prefs.mk | 21 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 12 |
2 files changed, 15 insertions, 18 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 37d0dc63c1d..6406c58f4b4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.242 2006/12/20 01:04:46 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.243 2006/12/27 14:29:45 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -421,17 +421,15 @@ CROSSBASE?= ${LOCALBASE}/cross .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) USE_XPKGWEDGE= yes -.else -USE_XPKGWEDGE?= yes -.endif - -.if defined(_OPSYS_NEEDS_XPKGWEDGE) && \ +.elif defined(_OPSYS_NEEDS_XPKGWEDGE) && \ !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) USE_XPKGWEDGE= yes -.endif - -.if ${PKG_INSTALLATION_TYPE} == "pkgviews" +.elif ${PKG_INSTALLATION_TYPE} == "pkgviews" USE_XPKGWEDGE= yes +.elif ${X11_TYPE} == "modular" +USE_XPKGWEDGE= no +.else +USE_XPKGWEDGE?= yes .endif # Default installation prefix for meta-pkgs/xorg. @@ -441,9 +439,10 @@ X11ROOT_PREFIX?= xorg X11ROOT_PREFIX?= # empty .endif -.if (defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \ - (defined(X11_TYPE) && empty(X11_TYPE:Mnative)) +.if ${X11_TYPE} == "xorg" X11BASE?= ${LOCALBASE}/${X11ROOT_PREFIX} +.elif ${X11_TYPE} == "modular" +X11BASE= ${LOCALBASE} .endif .if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 121fcfd63b7..a4ac7bc294d 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.141 2006/12/20 07:48:59 martti Exp $ +# $NetBSD: mk.conf,v 1.142 2006/12/27 14:29:45 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -236,15 +236,13 @@ PKGMANDIR?= man # Default: man (i.e. /usr/pkg/man) # NOTE: the support for custom setting (not "man") is not complete. -.if defined(X11_TYPE) && ${X11_TYPE} == "modular" -USE_XPKGWEDGE?= no -.else -USE_XPKGWEDGE?= yes -.endif +# USE_XPKGWEDGE?= yes # Whether we should use xpkgwedge or not to install all packages into # ${LOCALBASE}. # Possible: yes, no -# Default: yes +# This is not set here as X11_TYPE=modular does not use USE_XPKGWEDGE +# at all and the existence of xpkgwedge in the system overrides the +# user setting. BSDSRCDIR?= /usr/src # Where the NetBSD src module source tree is located |