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]}
---
 fonts/Xft2/builtin.mk       | 5 +++--
 fonts/fontconfig/builtin.mk | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'fonts')

diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 9ca295d32d8..0fefe090f74 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	Xft2
 
@@ -16,7 +16,8 @@ IS_BUILTIN.Xft2=	no
 .  if exists(${H_XFT2})
 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.Xft2!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.Xft2} && ${PWD_CMD}`;		\
 	cd ${TMPDIR:U/tmp:Q} &&						\
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 5e48d16ab8c..3fdac8407a1 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	fontconfig
 
@@ -17,7 +17,8 @@ IS_BUILTIN.fontconfig=	no
 .  if exists(${H_FONTCONFIG})
 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.fontconfig!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.fontconfig} && ${PWD_CMD}`;	\
 	cd ${TMPDIR:U/tmp:Q} &&						\
-- 
cgit v1.2.3