diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:51 +0000 |
| commit | dd30dabc8c342242d2f7de362ba8e4fbd55dc056 (patch) | |
| tree | dae0240406309a978c806a7f1e4b5be62fbd62bf /x11/tk | |
| parent | f79b2df20a2446d953dd624071a51110e3323693 (diff) | |
| download | pkgsrc-dd30dabc8c342242d2f7de362ba8e4fbd55dc056.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 'x11/tk')
| -rw-r--r-- | x11/tk/buildlink.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk index 0345e2a4341..db2cbee1711 100644 --- a/x11/tk/buildlink.mk +++ b/x11/tk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:34 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:55 jlam Exp $ # # This Makefile fragment is included by packages that use tk. # @@ -20,7 +20,7 @@ TK_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.tk?= tk>=8.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.tk}:../../x11/tk -BUILDLINK_PREFIX.tk= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.tk=tk BUILDLINK_FILES.tk= include/tk.h BUILDLINK_FILES.tk+= include/tkInt.h BUILDLINK_FILES.tk+= include/tkDecls.h @@ -44,9 +44,9 @@ tkConfig-buildlink: if [ ! -f $${cookie} ]; then \ file=lib/tkConfig.sh; \ ${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \ - ${SED} -e "s|-L${LOCALBASE}/lib|-L${BUILDLINK_DIR}/lib|g" \ - -e "s|${LOCALBASE}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" \ - ${LOCALBASE}/$${file} > ${BUILDLINK_DIR}/$${file}; \ + ${SED} -e "s|-L${BUILDLINK_PREFIX.tk}/lib|-L${BUILDLINK_DIR}/lib|g" \ + -e "s|${BUILDLINK_PREFIX.tk}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" \ + ${BUILDLINK_PREFIX.tk}/$${file} > ${BUILDLINK_DIR}/$${file}; \ ${CHMOD} +x ${BUILDLINK_DIR}/$${file}; \ ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ fi |