diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index 6b6d84b7394..2ed058866c4 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 1999/10/29 12:05:31 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/01/06 02:08:37 brad Exp $
 # $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
 
 DISTNAME=	tk8.0.5
@@ -9,21 +9,22 @@ MASTER_SITE_SUBDIR= tcl8_0
 
 NEED_VERSION=	1.92
 
-SEPARATE_BUILD=	concurrent
 MAINTAINER=	niklas@openbsd.org
 
 LIB_DEPENDS=	tcl80.1.5:${PORTSDIR}/lang/tcl80
 
-WRKSRC=		${WRKDIR}/tk8.0.5/unix
+SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} 
 
-post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+WRKSRC=	${WRKDIR}/tk8.0.5/unix
 
-test:
-	@cd ${WRKBUILD}; make test
+post-install:
+	@${LDCONFIG} -m ${PREFIX}/lib
+
+test:	build
+	@cd ${WRKBUILD} && make test
 
 .include <bsd.port.mk>