diff options
author | agc <agc@pkgsrc.org> | 2001-12-15 20:25:34 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2001-12-15 20:25:34 +0000 |
commit | ccff9099bcc040b948d88c32959fa8204a9900f4 (patch) | |
tree | 8f67a7596dd99f5fb7729eb89ce6b6a3af3c8f95 /lang | |
parent | 36ce7249f893aba53d41fe7e3db33c37e3ba143a (diff) | |
download | pkgsrc-ccff9099bcc040b948d88c32959fa8204a9900f4.tar.gz |
Modify all references to PKGSRCDIR to _PKGSRCDIR, except in the external
references of the pkglint package.
_PKGSRCDIR is an internal definition in bsd.pkg.mk, and a few packages
which would like to refer to other packages in the build tree. It should
not be set by users, but neither should it stop a user from building a
package if it is defined, so make it obvious that this is the case.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/tcl-itcl/Makefile | 10 | ||||
-rw-r--r-- | lang/tcl-tclX/Makefile | 6 | ||||
-rw-r--r-- | lang/tk-tclX/Makefile | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile index e988eb4167b..3741b36b102 100644 --- a/lang/tcl-itcl/Makefile +++ b/lang/tcl-itcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/17 23:23:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/15 20:25:37 agc Exp $ DISTNAME= itcl3.2 PKGNAME= tcl-itcl-3.2 @@ -16,8 +16,8 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-shared -CONFIGURE_ENV+= TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" -CONFIGURE_ENV+= TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" +CONFIGURE_ENV+= TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" +CONFIGURE_ENV+= TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" post-extract: @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/dialog.n \ @@ -28,10 +28,10 @@ post-extract: ${WRKSRC}/iwidgets2.2.0/doc/itcldialog.n @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n \ ${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n - @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi - @if [ ! -e ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ + @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index b5c964719c1..da5c822f430 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/17 23:23:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2001/12/15 20:25:37 agc Exp $ # DISTNAME= tclX8.2.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared --with-tcl=${PREFIX}/lib --enable-tk=NO CONFIGURE_ENV+= \ - PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" + PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/tclX8.2.0/unix post-extract: @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n - @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index e9dbd60a8ca..d1cc3f103e4 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/17 23:23:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:37 agc Exp $ # DISTNAME= tclX8.2.0 @@ -21,8 +21,8 @@ CONFIGURE_ARGS+= --enable-shared --with-tcl=${PREFIX}/lib \ --with-tk=${PREFIX}/lib CONFIGURE_ENV+= \ - PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \ - PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" + PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \ + PKGSRC_TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ @@ -35,10 +35,10 @@ PATCHDIR= ${.CURDIR}/../../lang/tcl-tclX/patches post-extract: ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n - @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi - @if [ ! -e ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ + @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi |