diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl-tclX/Makefile | 6 | ||||
| -rw-r--r-- | lang/tk-tclX/Makefile | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index fe5f9c87b88..50c33abe9a9 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/10/03 00:15:03 tv Exp $ +# $NetBSD: Makefile,v 1.22 2004/10/07 02:01:37 jlam Exp $ # DISTNAME= tclx8.3.5-src @@ -25,7 +25,9 @@ CONFIGURE_ARGS+= --enable-shared \ --enable-tk=NO TEST_TARGET= test -PKGSRC_TCL_SRC_DIR= ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6 +.include "../../mk/bsd.prefs.mk" + +PKGSRC_TCL_SRC_DIR= ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6 CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index fc5967c9e71..71d4ff503ab 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/10/03 00:15:03 tv Exp $ +# $NetBSD: Makefile,v 1.20 2004/10/07 02:01:37 jlam Exp $ # DISTNAME= tclx8.3.5-src @@ -25,9 +25,11 @@ CONFIGURE_ARGS+= --enable-shared \ TEST_DIRS= ${WRKSRC}/../tk/unix TEST_TARGET= test +.include "../../mk/bsd.prefs.mk" + CONFIGURE_ENV+= \ - PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6" \ - PKGSRC_TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6" + PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6" \ + PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ @@ -46,10 +48,10 @@ INSTALLATION_DIRS= bin include post-extract: ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n - @if [ ! -r ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6 ]; then \ + @if [ ! -r ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi - @if [ ! -r ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6 ]; then \ + @if [ ! -r ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi |