summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'fonts')
-rw-r--r--fonts/Xft2/builtin.mk5
-rw-r--r--fonts/fontconfig/builtin.mk5
2 files changed, 6 insertions, 4 deletions
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} && \