diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
| commit | a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 /x11/tk | |
| parent | 452509b0a2eb744db237df7645a87161418d6935 (diff) | |
| download | pkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.tar.gz | |
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 4 | ||||
| -rw-r--r-- | x11/tk/buildlink.mk | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index dd96ddbb0d4..3fa3583c527 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $ DISTNAME= tk8.3.2 PKGNAME= tk-8.3.2nb1 @@ -79,6 +79,6 @@ post-install: test: cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test -.include "../../mk/x11.buildlink.mk" .include "../../lang/tcl/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk index 2fb822da952..49b40954a3d 100644 --- a/x11/tk/buildlink.mk +++ b/x11/tk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/10/23 13:02:11 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/10/24 22:11:15 jlam Exp $ # # This Makefile fragment is included by packages that use tk. # @@ -42,10 +42,8 @@ tk-buildlink: _BUILDLINK_USE _TKCONFIG_SED= -e "/^TK_PREFIX/s|${BUILDLINK_PREFIX.tcl}|${BUILDLINK_DIR}|g" _TKCONFIG_SED+= -e "s|-L${BUILDLINK_PREFIX.tk}/lib|-L${BUILDLINK_DIR}/lib|g" _TKCONFIG_SED+= -e "s|${BUILDLINK_PREFIX.tk}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" -.if defined(X11_BUILDLINK_MK) _TKCONFIG_SED+= -e "s|-I${X11BASE}/|-I${BUILDLINK_X11_DIR}/|g" _TKCONFIG_SED+= -e "s|-L${X11BASE}/|-L${BUILDLINK_X11_DIR}/|g" -.endif tkConfig-buildlink: ${_PKG_SILENT}${_PKG_DEBUG} \ |