pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/tcl-tclX Access TCL source much more correctly an...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0797277ea1f1
branches:  trunk
changeset: 506093:0797277ea1f1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 11 21:06:37 2006 +0000

description:
Access TCL source much more correctly and working for configurations
with CREATE_WRKDIR_SYMLINK=no. Based on jlam's idea for
math/p5-Math-Pari.

diffstat:

 lang/tcl-tclX/Makefile |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r d06dd5a366ec -r 0797277ea1f1 lang/tcl-tclX/Makefile
--- a/lang/tcl-tclX/Makefile    Wed Jan 11 21:05:24 2006 +0000
+++ b/lang/tcl-tclX/Makefile    Wed Jan 11 21:06:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/11 21:06:37 joerg Exp $
 #
 
 DISTNAME=      tclx8.3.5-src
@@ -29,7 +29,11 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PKGSRC_TCL_SRC_DIR=    ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION}
+PKGSRCDIR.tcl=         ${.CURDIR}/../../lang/tcl
+WRKSRC.tcl_cmd=                \
+       cd ${PKGSRCDIR.tcl} && ${MAKE} show-var VARNAME=WRKSRC
+
+PKGSRC_TCL_SRC_DIR=    ${WRKSRC.tcl_cmd:sh}/../
 CONFIGURE_ENV+=                PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q}
 
 MAKE_ENV+=             GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
@@ -44,7 +48,7 @@
 post-extract:
        @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
        @if [ ! -r ${PKGSRC_TCL_SRC_DIR} ]; then        \
-               cd ../../lang/tcl && ${MAKE} extract;                   \
+               cd ${PKGSRCDIR.tcl} && ${MAKE} extract;                 \
        fi
 
 post-build:
@@ -60,6 +64,6 @@
 # so...
 
 pre-clean:
-       @cd ../../lang/tcl && ${MAKE} clean
+       @cd ${PKGSRCDIR.tcl} && ${MAKE} clean
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index