diff options
| author | joerg <joerg> | 2006-12-20 01:04:46 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-20 01:04:46 +0000 |
| commit | 069893ca9b431ca87bdb8f94ce60c6bcda6f008d (patch) | |
| tree | 4ef2b4e3b7c1d0a2f7de9e5285eeb1a8f5385608 /mk/bsd.pkg.use.mk | |
| parent | 8c33bac6a0d36181907193a79a59712347e25477 (diff) | |
| download | pkgsrc-069893ca9b431ca87bdb8f94ce60c6bcda6f008d.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/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 6644838c1af..9ff4ec92684 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.36 2006/07/07 14:29:41 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.37 2006/12/20 01:04:46 joerg Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -34,7 +34,9 @@ MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .if defined(USE_X11BASE) MTREE_FILE?= ${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist -. include "../../mk/x11.buildlink3.mk" +. if ${X11_TYPE} != "modular" +. include "../../mk/x11.buildlink3.mk" +. endif .endif .if ${PKG_INSTALLATION_TYPE} == "pkgviews" |