diff options
| author | joerg <joerg@pkgsrc.org> | 2006-07-11 14:42:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-07-11 14:42:03 +0000 |
| commit | 0926e95796b3a5ba4d3934ec7c9774514521cce9 (patch) | |
| tree | 0190bc57d36fec416f1e9fd1df7dfdccaaa161e1 /x11/xproto | |
| parent | 7ac5478c155b988d5d73f924c09029cce1baaed7 (diff) | |
| download | pkgsrc-0926e95796b3a5ba4d3934ec7c9774514521cce9.tar.gz | |
Don't use the builtin framework for the various Xorg components
when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly.
Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk.
This fixes a symmetry in the dependency list depending on whether
xorg-libs is installed already or not.
Discussed with jlam@
Diffstat (limited to 'x11/xproto')
| -rw-r--r-- | x11/xproto/buildlink3.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk index ecba2dcb864..5ae03d1d82c 100644 --- a/x11/xproto/buildlink3.mk +++ b/x11/xproto/buildlink3.mk @@ -1,8 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/07/11 14:42:04 joerg Exp $ # # This Makefile fragment is included by packages that use xproto. # +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} == "xorg" +.include "../../mk/x11.buildlink3.mk" +.else + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+ @@ -21,3 +27,5 @@ BUILDLINK_DEPMETHOD.xproto?= build .endif # XPROTO_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.endif |