diff options
| author | jlam <jlam@pkgsrc.org> | 2004-10-07 02:01:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-10-07 02:01:37 +0000 |
| commit | 17c3aafac1aa4cacaba3e9998eacf16787dfefb4 (patch) | |
| tree | 15912261de9f656cabfa82bfc7708e5e4ee1ae67 /lang/tk-tclX | |
| parent | d2eb44c14d837a993265620b7872506e7223a34f (diff) | |
| download | pkgsrc-17c3aafac1aa4cacaba3e9998eacf16787dfefb4.tar.gz | |
* Make PKGSRC_TOPDIR a private variable by renaming it to _PKGSRC_TOPDIR,
as it's only used internally by bsd.prefs.mk.
* Make _PKGSRCDIR a public variable by renaming it to PKGSRCDIR.
Also, generate its value from ${_PKGSRC_TOPDIR} so it's less fragile
than the old method of stripping off the last two components of
${.CURDIR}. PKGSRCDIR may now be used after bsd.prefs.mk is defined.
* Change all references to _PKGSRCDIR to PKGSRCDIR.
Diffstat (limited to 'lang/tk-tclX')
| -rw-r--r-- | lang/tk-tclX/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
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 |