diff options
| author | agc <agc> | 2004-01-23 16:49:47 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-01-23 16:49:47 +0000 |
| commit | 17cd0c73ae968915e6ce8785de58b3b03e597175 (patch) | |
| tree | 1874d19cecc8c173e67c4b1f4b2198b8cdf05e83 /mk | |
| parent | 3a7f68033a4ca67be82920f71e42c12f073e73be (diff) | |
| download | pkgsrc-17cd0c73ae968915e6ce8785de58b3b03e597175.tar.gz | |
Temporary fix for xpkgwedge'd packages which were getting buildlinked
with a prefix of X11BASE, rather than LOCALBASE - check whether
USE_XPKGWEDGE is defined to {"YES", "yes"} as well as looking for the
existence of the xpkgwedge definition file when calculating the value
of X11PREFIX.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 262e41f673d..ec87416208d 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.140 2004/01/21 18:13:27 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.141 2004/01/23 16:49:47 agc Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -283,7 +283,8 @@ CROSSBASE?= ${LOCALBASE}/cross XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} -a XMKMF_FLAGS?= # empty .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ - exists(${X11BASE}/lib/X11/config/xpkgwedge.def) + exists(${X11BASE}/lib/X11/config/xpkgwedge.def) || \ + !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) HAVE_XPKGWEDGE= yes X11PREFIX= ${LOCALBASE} XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf |