diff options
| author | tv <tv> | 2006-03-06 19:21:34 +0000 |
|---|---|---|
| committer | tv <tv> | 2006-03-06 19:21:34 +0000 |
| commit | 7830d4c0d07a8caa368bb036340d1665f1cd57b9 (patch) | |
| tree | 877b2184bdb40cad9a5f4731404a219f95f7885c /textproc/expat | |
| parent | 8436878830ed909763857ac7e57b93173444cab3 (diff) | |
| download | pkgsrc-7830d4c0d07a8caa368bb036340d1665f1cd57b9.tar.gz | |
If the builtin expat is in /usr, not X11BASE, don't depend on X11 build
infrastructure.
Diffstat (limited to 'textproc/expat')
| -rw-r--r-- | textproc/expat/builtin.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk index b523b2bd4ad..1465e3aeb79 100644 --- a/textproc/expat/builtin.mk +++ b/textproc/expat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2006/03/03 17:47:58 tv Exp $ +# $NetBSD: builtin.mk,v 1.9 2006/03/06 19:21:34 tv Exp $ BUILTIN_PKG:= expat @@ -81,9 +81,13 @@ BUILDLINK_DEPENDS.expat+= expat>=1.95.4 . endif . if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) +. if !empty(H_EXPAT:M${X11BASE}/) BUILDLINK_PREFIX.expat= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. else +BUILDLINK_PREFIX.expat= /usr +. endif . endif .endif # CHECK_BUILTIN.expat |