diff options
| author | jlam <jlam> | 2005-05-02 21:10:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-02 21:10:02 +0000 |
| commit | 80227cfbf54ce6210ed2ee39347088f3e97dddf2 (patch) | |
| tree | 9fb4cd26df4c1607040ac076b155620123e3b91b /mk/bsd.prefs.mk | |
| parent | 019ba55fcab9195742cf7caba22a9c7411c633c5 (diff) | |
| download | pkgsrc-80227cfbf54ce6210ed2ee39347088f3e97dddf2.tar.gz | |
* Push the imake- and xmkmf-handling into the new tools framework.
* Get rid of an explicit check for ${_IMAKE_MAKE} == ${GMAKE} in
bsd.pkg.mk to check for whether we need to depend on gmake or not.
Instead, we now note in Linux.mk that packages that need imake will
also need to use gmake by setting _IMAKE_TOOLS+=gmake.
* Push the definition of MAKE_PROGRAM from bsd.pkg.mk into make.mk where
it's closer to related code.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 15f28b2c478..0744a9c8ae9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.187 2005/05/02 05:16:21 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.188 2005/05/02 21:10:02 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -393,14 +393,20 @@ _XPKGWEDGE_REQD= 1.9 # The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def # is to catch users of xpkgwedge<1.0. # +.if empty(_USE_NEW_TOOLS:M[yY][eE][sS]) XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} -a XMKMF_FLAGS?= # empty +.endif .if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) X11PREFIX= ${LOCALBASE} +. if empty(_USE_NEW_TOOLS:M[yY][eE][sS]) XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf +. endif .else X11PREFIX= ${X11BASE} +. if empty(_USE_NEW_TOOLS:M[yY][eE][sS]) XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf +. endif .endif DEPOT_SUBDIR?= packages |