diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:31 +0000 |
| commit | 7b1d3cb4652a3602fe1254e08c29dca10e7c0c60 (patch) | |
| tree | b2e768de7c211ef606d480324d634b7befcb3c51 /lang | |
| parent | 342f418a3ac28ae57ca1ff09ca81aeb9fd066251 (diff) | |
| download | pkgsrc-7b1d3cb4652a3602fe1254e08c29dca10e7c0c60.tar.gz | |
Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set
BUILDLINK_PREFIX.<pkgname>. This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed. Idea by Alistair Crooks <agc@pkgsrc.org>.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/f2c/buildlink.mk | 4 | ||||
| -rw-r--r-- | lang/tcl/buildlink.mk | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lang/f2c/buildlink.mk b/lang/f2c/buildlink.mk index a89e9c8f5fd..488efb70774 100644 --- a/lang/f2c/buildlink.mk +++ b/lang/f2c/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/18 22:11:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:47 jlam Exp $ # # This Makefile fragment is included by packages that use f2c. # @@ -20,7 +20,7 @@ F2C_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.f2c?= f2c>=20001205nb3 DEPENDS+= ${BUILDLINK_DEPENDS.f2c}:../../lang/f2c -BUILDLINK_PREFIX.f2c= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.f2c=f2c BUILDLINK_FILES.f2c= include/f2c.h BUILDLINK_FILES.f2c+= lib/libf2c.* BUILDLINK_FILES.f2c+= lib/libf2c_p.a diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk index 60b8cefd528..efeac03a8d4 100644 --- a/lang/tcl/buildlink.mk +++ b/lang/tcl/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:48 jlam Exp $ # # This Makefile fragment is included by packages that use tcl. # @@ -20,7 +20,7 @@ TCL_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.tcl?= tcl>=8.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.tcl}:../../lang/tcl -BUILDLINK_PREFIX.tcl= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.tcl=tcl BUILDLINK_FILES.tcl= include/tcl.h BUILDLINK_FILES.tcl+= include/tclDecls.h BUILDLINK_FILES.tcl+= include/tcl/*/*.h @@ -40,9 +40,9 @@ tclConfig-buildlink: if [ ! -f $${cookie} ]; then \ file=lib/tclConfig.sh; \ ${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \ - ${SED} -e "s|-L${LOCALBASE}/lib|-L${BUILDLINK_DIR}/lib|g" \ - -e "s|${LOCALBASE}/lib/libtclstub|${BUILDLINK_DIR}/lib/libtclstub|g" \ - ${LOCALBASE}/$${file} > ${BUILDLINK_DIR}/$${file}; \ + ${SED} -e "s|-L${BUILDLINK_PREFIX.tcl}/lib|-L${BUILDLINK_DIR}/lib|g" \ + -e "s|${BUILDLINK_PREFIX.tcl}/lib/libtclstub|${BUILDLINK_DIR}/lib/libtclstub|g" \ + ${BUILDLINK_PREFIX.tcl}/$${file} > ${BUILDLINK_DIR}/$${file}; \ ${CHMOD} +x ${BUILDLINK_DIR}/$${file}; \ ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ fi |