From 9d7ff2090c37e0ed57733d378012152b047c6ae6 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 3 Jun 2005 17:02:36 +0000
Subject: 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]}
---
 x11/Xcomposite/builtin.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'x11/Xcomposite')

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} && 					\
-- 
cgit v1.2.3