summaryrefslogtreecommitdiff
path: root/textproc/expat/builtin.mk
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2006-03-03 17:47:58 +0000
committertv <tv@pkgsrc.org>2006-03-03 17:47:58 +0000
commit5bda6b101c83f81ed7ee0c2e3721603d39baac55 (patch)
tree45f01b0be1173bd7c7e15f7b3aa668f3a02e2a66 /textproc/expat/builtin.mk
parent93b34f0e6db58f72b0bcabd18808b35330d4385c (diff)
downloadpkgsrc-5bda6b101c83f81ed7ee0c2e3721603d39baac55.tar.gz
Make it possible to use a builtin expat rooted at /usr (common to some
Linux distros). Still preferred to be pkgsrc by default in pkgsrc/mk, but allows PREFER.expat=native to work on such systems now.
Diffstat (limited to 'textproc/expat/builtin.mk')
-rw-r--r--textproc/expat/builtin.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 4f5677823c3..b523b2bd4ad 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/03 17:47:58 tv Exp $
BUILTIN_PKG:= expat
BUILTIN_FIND_FILES_VAR:= H_EXPAT
-BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h
+BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h /usr/include/expat.h
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -14,9 +14,13 @@ BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h
.if !defined(IS_BUILTIN.expat)
IS_BUILTIN.expat= no
. if exists(${H_EXPAT})
+. if !empty(H_EXPAT:M${X11BASE}/)
BUILTIN_IMAKE_CHECK:= expat:BuildExpatLibrary
-. include "../../mk/buildlink3/imake-check.mk"
+. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.expat= ${BUILTIN_IMAKE_CHECK.expat}
+. else
+IS_BUILTIN.expat= yes
+. endif
. endif
.endif
MAKEVARS+= IS_BUILTIN.expat