diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-03 17:02:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-03 17:02:36 +0000 |
| commit | c85165ac0786a6271c5e08213cf55d5cb30c803f (patch) | |
| tree | d3c47bbb811d1a1d26669c17575bcf7bdc8ec3fc /graphics/xpm | |
| parent | 34af7f3ee5c052ed041d03d4abf04dca86bdcf25 (diff) | |
| download | pkgsrc-c85165ac0786a6271c5e08213cf55d5cb30c803f.tar.gz | |
Only check for the existence of the first word of ${IMAKE} since it may
contain a command plus arguments. We use the standard idiom to extract
the first word of a list stored in a make variable:
VAR_CMD= ${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
XXX This can be replaced with a more succinct use of variable modifiers
XXX when we update the bootstrap bmake to match the latest NetBSD make
XXX sources, i.e.:
XXX
XXX VAR_CMD= ${VAR:[1]}
Diffstat (limited to 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/builtin.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index 65269bdec3f..cdf9d3d0ccd 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2005/06/03 16:03:09 jlam Exp $ +# $NetBSD: builtin.mk,v 1.9 2005/06/03 17:02:36 jlam Exp $ BUILTIN_PKG:= xpm @@ -26,7 +26,8 @@ IS_BUILTIN.xpm= yes . else PKGSRC_USE_TOOLS+= imake # XXX IMAKE?= ${X11BASE}/bin/imake # XXX -. if defined(IMAKE) && exists(${IMAKE:C/ .*//}) +_BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} +. if exists(${_BUILTIN_IMAKE_CMD}) IS_BUILTIN.xpm!= \ dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${PWD_CMD}`; \ cd ${TMPDIR:U/tmp:Q} && \ |