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.prefs.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.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index da3654789be..37d0dc63c1d 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.241 2006/10/09 12:25:44 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.242 2006/12/20 01:04:46 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -560,7 +560,10 @@ PKG_DEFAULT_OPTIONS?= # empty PKG_OPTIONS?= # empty # we want this *before* compiler.mk, so that compiler.mk paths override them -PREPEND_PATH+= ${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin +.if ${X11_TYPE} != "modular" && defined(USE_X11) +PREPEND_PATH+= ${X11BASE}/bin +.endif +PREPEND_PATH+= ${LOCALBASE}/bin # Wrapper framework definitions .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk" |