From f4f36da4467e0c7696695977012e44532136df1c Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 11 Jan 2006 21:06:37 +0000
Subject: 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.

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

(limited to 'lang/tcl-tclX')

diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 14aa96f7f5c..e1e1edc5fa8 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -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 @@ TEST_TARGET=		test
 
 .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 @@ INSTALLATION_DIRS=	bin include
 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 @@ post-install:
 # so...
 
 pre-clean:
-	@cd ../../lang/tcl && ${MAKE} clean
+	@cd ${PKGSRCDIR.tcl} && ${MAKE} clean
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3