diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-20 01:04:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-20 01:04:46 +0000 |
| commit | 79c5c99c4df5f432c4c3dd037f61732d864c05a0 (patch) | |
| tree | 4ef2b4e3b7c1d0a2f7de9e5285eeb1a8f5385608 /mk/defaults | |
| parent | ab4b6f3a1e4e951e45b2a7e00e54d2e48ff1bdd7 (diff) | |
| download | pkgsrc-79c5c99c4df5f432c4c3dd037f61732d864c05a0.tar.gz | |
For modular Xorg disable xpkgwedge (will be made a hard error later).
Don't add ${X11BASE}/bin to PATH, don't include mk/x11.buildlink3.mk
when USE_X11BASE is set and don't use BUILDLINK_X11_DIR and related
magic.
OKed by wiz@
Diffstat (limited to 'mk/defaults')
| -rw-r--r-- | mk/defaults/mk.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 0ac9edec140..f05349c672d 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.139 2006/12/15 13:15:06 martti Exp $ +# $NetBSD: mk.conf,v 1.140 2006/12/20 01:04:46 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -236,7 +236,11 @@ PKGMANDIR?= man # Default: man (i.e. /usr/pkg/man) # NOTE: the support for custom setting (not "man") is not complete. +.if ${X11_TYPE} == "modular" +USE_XPKGWEDGE?= no +.else USE_XPKGWEDGE?= yes +.endif # Whether we should use xpkgwedge or not to install all packages into # ${LOCALBASE}. # Possible: yes, no |