summaryrefslogtreecommitdiff
path: root/devel/rvm
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-10 00:09:29 +0000
committerjlam <jlam@pkgsrc.org>2001-06-10 00:09:29 +0000
commit5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d (patch)
tree7a6bfc07ceedb0e0b8ac1235a0168afecaf37111 /devel/rvm
parent3bc5e40254426847ecde2acbbfab3d3fbc8e20a6 (diff)
downloadpkgsrc-5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d.tar.gz
Use cookies (.*_done) to determine whether headers and libs have been
linked from a particular package, and add a pre-configure target to the buildlink.mk file to more painlessly use buildlink.mk files. A ${BUILDLINK_TARGETS} variable still exists in case a package _must_ define NO_CONFIGURE.
Diffstat (limited to 'devel/rvm')
-rw-r--r--devel/rvm/buildlink.mk17
1 files changed, 12 insertions, 5 deletions
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 662a715e304..8ae5b8fab88 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:29:50 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
#
# This Makefile fragment is included by packages that use rvm.
#
@@ -16,8 +16,6 @@
.if !defined(RVM_BUILDLINK_MK)
RVM_BUILDLINK_MK= # defined
-.include "../../devel/lwp/buildlink.mk"
-
RVM_REQD?= 1.3
DEPENDS+= rvm>=${RVM_REQD}:../../devel/rvm
@@ -31,8 +29,17 @@ RVM_LIBS+= ${LOCALBASE}/lib/libseg.*
BUILDLINK_INCDIR?= ${WRKDIR}/include
BUILDLINK_LIBDIR?= ${WRKDIR}/lib
-BUILDLINK_TARGETS+= link-rvm-headers
-BUILDLINK_TARGETS+= link-rvm-libs
+.include "../../devel/lwp/buildlink.mk"
+
+RVM_BUILDLINK_COOKIE= ${WRKDIR}/.rvm_buildlink_done
+RVM_BUILDLINK_TARGETS= link-rvm-headers
+RVM_BUILDLINK_TARGETS+= link-rvm-libs
+BUILDLINK_TARGETS+= ${RVM_BUILDLINK_COOKIE}
+
+pre-configure: ${RVM_BUILDLINK_COOKIE}
+
+${RVM_BUILDLINK_COOKIE}: ${RVM_BUILDLINK_TARGETS}
+ @${TOUCH} ${TOUCH_FLAGS} ${RVM_BUILDLINK_COOKIE}
# This target links the headers into ${BUILDLINK_INCDIR}, which should
# be searched first by the C preprocessor.