summaryrefslogtreecommitdiff
path: root/x11/Xcomposite
diff options
context:
space:
mode:
authorjlam <jlam>2005-06-03 17:02:36 +0000
committerjlam <jlam>2005-06-03 17:02:36 +0000
commit9c7cc0611bcb93ada5bcf2b92bb15f59ae940350 (patch)
treed3c47bbb811d1a1d26669c17575bcf7bdc8ec3fc /x11/Xcomposite
parentbfe1af32b824ccb46600ddb7793f48f1d06c96f5 (diff)
downloadpkgsrc-9c7cc0611bcb93ada5bcf2b92bb15f59ae940350.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 'x11/Xcomposite')
-rw-r--r--x11/Xcomposite/builtin.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 5c5011d5f38..24087d80b12 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $
BUILTIN_PKG:= Xcomposite
@@ -17,7 +17,8 @@ IS_BUILTIN.Xcomposite= no
. if exists(${H_XCOMPOSITE})
PKGSRC_USE_TOOLS+= imake # XXX
IMAKE?= ${X11BASE}/bin/imake # XXX
-. if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+. if exists(${_BUILTIN_IMAKE_CMD})
IS_BUILTIN.Xcomposite!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.Xcomposite} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \