diff options
| author | tnn <tnn> | 2007-07-27 17:44:43 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2007-07-27 17:44:43 +0000 |
| commit | 8d4d78c246b1ab542e913b1020b070561b992919 (patch) | |
| tree | 6652836c0a04ac39fee213de129794d600cd2628 /mk | |
| parent | 768bfef822a948e3ec6c227c538901f026cc0470 (diff) | |
| download | pkgsrc-8d4d78c246b1ab542e913b1020b070561b992919.tar.gz | |
If using X11_TYPE=modular this means we have imake(1) from pkgsrc.
We can't use our own imake to check for builtin packages so disable the
check and always report that no builtin implementation exists.
No objections on tech-pkg@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/imake-check.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk index 2acecb92457..1e9dc20e3d3 100644 --- a/mk/buildlink3/imake-check.mk +++ b/mk/buildlink3/imake-check.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake-check.mk,v 1.5 2006/09/10 16:39:31 tron Exp $ +# $NetBSD: imake-check.mk,v 1.6 2007/07/27 17:44:43 tnn Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -58,12 +58,15 @@ # .for _pair_ in ${BUILTIN_IMAKE_CHECK} +. if ${X11_TYPE} == "modular" +BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}= no +. else USE_TOOLS+= cat:pkgsrc echo:pkgsrc grep:pkgsrc mkdir:pkgsrc \ rm:pkgsrc test:pkgsrc USE_TOOLS+= imake:pkgsrc ${IMAKE_TOOLS:S/$/:pkgsrc/} # XXX IMAKE?= ${X11BASE}/bin/imake # XXX -. if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}) +. if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}) BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!= \ if ${SETENV} CAT=${CAT:Q} ECHO=${ECHO:Q} GREP=${GREP:Q} \ IMAKE=${IMAKE:Q} IMAKE_MAKE=${IMAKE_MAKE:Q} \ @@ -77,6 +80,7 @@ BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!= \ else \ ${ECHO} no; \ fi -. endif +. endif MAKEVARS+= BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//} +. endif .endfor |