diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-16 17:40:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-16 17:40:54 +0000 |
| commit | 3cf51717fcbc811a908a0dae0ee4ad01cf447559 (patch) | |
| tree | 88c2b32f047f386fd7c1872ab124127ad47f1496 | |
| parent | 0d70eb4ce843d5bd3dbd9a0c5e183433ff13f068 (diff) | |
| download | pkgsrc-3cf51717fcbc811a908a0dae0ee4ad01cf447559.tar.gz | |
Manipulate the buildlink depth so that libiconv and Xfixes aren't added
to BUILDLINK_DEPENDS unless their respective buildlink3.mk files are
included by the top-level Makefile.
| -rw-r--r-- | devel/gettext-lib/builtin.mk | 4 | ||||
| -rw-r--r-- | x11/xcursor/builtin.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index d073634700f..a67981691db 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $ .if !defined(_BLNK_LIBINTL_FOUND) _BLNK_LIBINTL_FOUND!= \ @@ -106,7 +106,9 @@ _GETTEXT_NEEDS_ICONV!= \ . if ${_GETTEXT_NEEDS_ICONV} == "yes" . for _mkfile_ in buildlink3.mk builtin.mk . if exists(../../converters/libiconv/${_mkfile_}) +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../converters/libiconv/${_mkfile_}" +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . endif . endfor BUILDLINK_DEPENDS.gettext+= ${_GETTEXT_ICONV_DEPENDS} diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index 817c2d7c25b..56563881777 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $ _X11_XCURSOR_XCURSOR_H= ${X11BASE}/include/X11/Xcursor/Xcursor.h @@ -56,7 +56,9 @@ BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 . for _mkfile_ in buildlink3.mk builtin.mk . if exists(../../x11/Xfixes/${_mkfile_}) +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../x11/Xfixes/${_mkfile_}" +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . endif . endfor .endif |