From 9c96fcd377a69cdee7c48072eb28938cb4b7092b Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Mon, 5 Apr 1999 03:41:16 +0000
Subject:  - Find tk package in the proper directory (even with WRKOBJDIR set) 
 - tk source is now in a different directory  - add a pre-clean target to
 clean out the dependencies

---
 mbone/nte/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'mbone/nte')

diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 82a3d8c0a05..005e347356e 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/04/01 13:38:44 agc Exp $
+# $NetBSD: Makefile,v 1.15 1999/04/05 03:41:16 hubertf Exp $
 #
 
 DISTNAME=	nt.1.5a23
@@ -8,11 +8,11 @@ MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/nte/
 
 MAINTAINER=	mycroft@netbsd.org
 
-BUILD_DEPENDS=	${BUILD_ROOT}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
+BUILD_DEPENDS=	${TK_SRC}/generic/default.h:${TK_DIR}:configure
 DEPENDS+=	tk-8.0.5:../../x11/tk80
 
-TK_DIR=         ${BUILD_ROOT}/x11/tk80
-TK_SRC=		${TK_DIR}/${WRKDIR:T}/tk8.0
+TK_DIR=         ${.CURDIR}/../../x11/tk80
+TK_SRC=		${TK_DIR}/${WRKDIR:T}/tk8.0.5
 
 NOT_FOR_ARCHS=	alpha	# ANSI headers cause LP64 problems
 
@@ -38,4 +38,7 @@ do-configure:
 pre-build:	${WRKSRC}/netbsd/hsearch.o
 
 ${WRKSRC}/netbsd/hsearch.o:	${WRKSRC}/src/hsearch.c
-		${CC} -I${WRKSRC}/src ${CFLAGS} -c -o $@ ${WRKSRC}/src/hsearch.c
+	${CC} -I${WRKSRC}/src ${CFLAGS} -c -o $@ ${WRKSRC}/src/hsearch.c
+
+pre-clean:
+	@cd ${TK_DIR} && ${MAKE} clean
-- 
cgit v1.2.3