From 40fec4076a849563c08d87a781061b006992cceb Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 24 Apr 2004 08:06:10 +0000 Subject: Include buildlink code for "tk" package because this package depends on the "tk" package. --- lang/ocaml/buildlink2.mk | 4 +++- lang/ocaml/buildlink3.mk | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'lang/ocaml') diff --git a/lang/ocaml/buildlink2.mk b/lang/ocaml/buildlink2.mk index 08e0cfa51d7..e6ff91fcc44 100644 --- a/lang/ocaml/buildlink2.mk +++ b/lang/ocaml/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2004/04/22 09:18:35 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2004/04/24 08:06:10 tron Exp $ # # This Makefile fragment is included by packages that use ocaml. @@ -23,4 +23,6 @@ BUILDLINK_TARGETS+= ocaml-buildlink ocaml-buildlink: _BUILDLINK_USE +.include "../../x11/tk/buildlink3.mk" + .endif # OCAML_BUILDLINK2_MK diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 9c36f9a957d..7be869017bc 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/04/22 09:18:35 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/04/24 08:06:10 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ @@ -7,13 +7,15 @@ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= ocaml .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml} -BUILDLINK_PACKAGES+= ocaml +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml} +BUILDLINK_PACKAGES+= ocaml +BUILDLINK_DEPMETHOD.ocaml?= build .if !empty(OCAML_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ocaml+= ocaml>=3.06nb6 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml -BUILDLINK_DEPMETHOD.ocaml?= build .endif # OCAML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +.include "../../x11/tk/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3