Adapt to new handling of "${CONFIGURE}".

28 files changed, 62 insertions, 61 deletions

diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index ec465f3742c..838f3765374 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/09/14 17:15:05 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/27 08:54:53 tron Exp $
 #
 
 DISTNAME=	fastcap-2.0-15Jul92
@@ -21,7 +21,7 @@ IGNOREFILES=	postscript/ug.ps.Z \
 		postscript/tcad.ps.Z
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	config
+CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS=		4
 
 do-install:
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index f763ef7207b..ef590f6014e 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/09/15 09:26:24 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/27 08:54:54 tron Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -12,7 +12,7 @@ MAINTAINER=	mcmahill@alum.mit.edu
 HOMEPAGE=	http://kontiki.mit.edu/rle/research/info_research_proj.html
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	config
+CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS=		default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index b0eb0030758..1224dc02a6d 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/01/18 20:41:11 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/03/27 08:54:55 tron Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 CATEGORIES=	comms
@@ -18,7 +18,7 @@ HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
 CONFIGURE_ARGS=		</dev/null
-CONFIGURE_SCRIPT=	Setup
+CONFIGURE_SCRIPT=	./Setup
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
 
 PM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 00e2d3d5cd4..66b85d643ed 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/02/27 04:43:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/27 08:54:55 tron Exp $
 
 .include		"Makefile.common"
 
@@ -12,7 +12,7 @@ INSTALL_TARGET=		installvimhelp installhelplinks installmacros \
 			installtutor installtools
 
 post-configure:
-	cd ${WRKSRC}/ctags ; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} \
+	cd ${WRKSRC}/ctags ; ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} \
 			     ${CONFIGURE_ARGS}
 
 do-build:
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index abd1e0163a8..d15911353a1 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/29 01:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/27 08:54:55 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.cs.wisc.edu/~larus/spim.html
 NO_WRKSUBDIR=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
 XMKMF=			xmkmf # don't specify -a option
 
diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile
index 7b5dba0e3c9..f37f37a6be1 100644
--- a/games/nethack-lib/Makefile
+++ b/games/nethack-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/12/24 22:29:59 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2000/03/27 08:54:55 tron Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -10,7 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.win.tue.nl/games/roguelike/nethack/
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	sys/unix/setup.sh
+CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		datastuff
 INSTALL_TARGET=		manpages install-dat
 
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 56990b479d8..666cf34f498 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/12/29 16:15:47 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2000/03/27 08:54:55 tron Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -18,7 +18,7 @@ WRKSRC=			${WRKDIR}/nethack-3.3.0
 USE_X11=		yes
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	sys/unix/setup.sh
+CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		nethack tiles.xpm
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-qt QTDIR=${X11BASE}
diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile
index 04da9abafd5..ba59d127833 100644
--- a/games/nethack-tty/Makefile
+++ b/games/nethack-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/24 22:30:04 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/27 08:54:56 tron Exp $
 
 DISTNAME=		nethack-3.3.0
 PKGNAME=		nethack-tty-3.3.0
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.win.tue.nl/games/roguelike/nethack/
 DEPENDS+=		nethack-lib-3.3.0:../nethack-lib
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	sys/unix/setup.sh
+CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-tty
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 9d7aa100b50..2679a51301f 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/24 22:30:05 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:56 tron Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -14,7 +14,7 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 USE_X11=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	sys/unix/setup.sh
+CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index d443408bffc..07205fd82c1 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2000/03/21 22:40:53 tron Exp $
+# $NetBSD: Makefile,v 1.49 2000/03/27 08:54:56 tron Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -46,7 +46,7 @@ LDFLAGS+=		-Wl,-E
 post-configure:
 	@${ECHO_MSG} "--> now configuring in ${GIMP_DATA}"
 	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV} \
-		./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+		${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 pre-build:
 	@if [ "$$DISPLAY" = "" ]; then \
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 380a48461e4..c6e1e36373e 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/03/22 09:38:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/03/27 08:54:57 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/05/26 04:04:11 mph Exp
 #
 
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${BUILD_ROOT}/graphics/urt/${WRKDIR:T}/include/rle.h:../../graphi
 DEPENDS+=	urt-3.1b1:../../graphics/urt
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	< ${WRKDIR}/config.ans
 ALL_TARGET=
 
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 25093055e00..249b5cf4e99 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/01/02 03:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/03/27 08:54:56 tron Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
 #
 
@@ -21,7 +21,7 @@ EXTRACT_ONLY=	urt-3.1b.tar.Z
 
 USE_X11=	yes
 NO_WRKSUBDIR=   yes
-CONFIGURE_SCRIPT=Configure
+CONFIGURE_SCRIPT=./Configure
 CONFIGURE_ARGS=	config/urt
 HAS_CONFIGURE=	yes
 MAKEFILE=	makefile
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5021d6ada0e..81b6addf42c 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/12/18 04:53:17 mjl Exp $
+# $NetBSD: Makefile,v 1.12 2000/03/27 08:54:57 tron Exp $
 
 DISTNAME=		clisp-1999-07-22
 PKGNAME=		clisp-19990722
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
 do-configure:
 	cd ${WRKSRC}; \
-	(cd ..;./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}); \
+	(cd ..;${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}); \
 	./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \
 	  --with-dynamic-ffi >Makefile
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 61a1bcf367a..9c69953047c 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/24 23:41:20 tron Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/27 08:54:58 tron Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -19,14 +19,15 @@ BROKEN=			package needs more work, see "Makefile".
 # working on other platforms please add them.
 ONLY_FOR_PLATFORM=	NetBSD-1.4[E-Z]-i386 NetBSD-1.[5-9]*-i386
 
-GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-CONFIGURE_SCRIPT=	../${DISTNAME}/configure
-
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${SRCDIR}/configure
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
-WRKSRC=			${WRKDIR}/obj-${MACHINE_GNU_PLATFORM}
 
-CONFDIR=		${WRKDIR}/${DISTNAME}/gcc/config
+SRCDIR=			${WRKDIR}/${DISTNAME}
+WRKSRC=			${WRKDIR}/objdir
+
+CONFDIR=		${SRCDIR}/gcc/config
 # Files taken from "src/gnu/dist/gcc/config".
 CONFFILES=		i386_netbsd-elf.h i386_netbsd.h
 
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index ab5c7c28a1c..a9c643a6c61 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/01/24 12:27:20 augustss Exp $
+# $NetBSD: Makefile,v 1.10 2000/03/27 08:54:57 tron Exp $
 
 DISTNAME=	Hugs98-May1999
 PKGNAME=	Hugs98-199905
@@ -19,7 +19,7 @@ MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 do-configure:
-	cd ${WRKSRC}; (cd unix; ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+	cd ${WRKSRC}; (cd unix; ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../docs/hugs.1 ${PREFIX}/man/man1/hugs.1
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 4341ac110cc..bd6da327583 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:44 tv Exp $
+# $NetBSD: Makefile,v 1.8 2000/03/27 08:54:57 tron Exp $
 #
 
 DISTNAME=		perl5.004_04
@@ -23,7 +23,7 @@ PATCHDIR=		../perl5/patches
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} -Duseshrplib=true \
 			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
 			-Dusemymalloc=false
diff --git a/lang/perl5-current/Makefile b/lang/perl5-current/Makefile
index fa25c8916c1..bc176b48dd5 100644
--- a/lang/perl5-current/Makefile
+++ b/lang/perl5-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/18 22:27:17 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/27 08:54:58 tron Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=		http://language.perl.com/index.html
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} -Doptimize="${CFLAGS}" \
 			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
 			-Dcc=gcc -Dusemymalloc=false
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 4725a8e6178..6734d1473f2 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/01/18 22:31:46 tron Exp $
+# $NetBSD: Makefile,v 1.28 2000/03/27 08:54:57 tron Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=		http://language.perl.com/index.html
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} -Doptimize="${CFLAGS}" \
 			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
 			-Dcc=gcc -Dusemymalloc=false
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 7ea6573ae88..e21364d398c 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/01/03 21:47:55 simonb Exp $
+# $NetBSD: Makefile,v 1.11 2000/03/27 08:54:58 tron Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.myxa.com/old/elm.html
 
 HAS_CONFIGURE=		Yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}"
 CONFIGURE_ARGS=		-S
 
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 05d1fdb1626..95159ffdd4e 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/26 17:35:41 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/27 08:54:59 tron Exp $
 # FreeBSD: ports/mail/mailagent/Makefile,v 1.28 1999/08/31 06:47:24 mharo Exp
 #
 
@@ -17,7 +17,7 @@ USE_PERL5=	yes
 NO_PACKAGE=	"Correct FQDN needs to be hardcoded"
 IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS=		-dres \
 			-Dperlpath='${PERL5}' \
 			-Dutmp='/var/run/utmp' \
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index 07bac8fb4fc..aed97a2cad3 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:59 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/02 08:39:12 obrien Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=utils/console/}
 MAINTAINER=		packages@netbsd.org
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 ALL_TARGET=
 
 do-install:
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index d765e93b53d..5353cd664e6 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/11 13:56:52 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/27 08:54:59 tron Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -15,7 +15,7 @@ USE_LIBTOOL=	yes
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} \
 				-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS}
 INSTALL_TARGET=	install install.man
diff --git a/news/trn/Makefile b/news/trn/Makefile
index 5560393caa1..d07c4ba2a72 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/03/18 19:51:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:59 tron Exp $
 #
 
 DISTNAME=		trn4-test72
@@ -26,7 +26,7 @@ TRN_HOSTBITS?=		0
 USE_PERL5=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ENV=		PREFIX=${PREFIX}
 CONFIGURE_ARGS=		-d -e -D bin=${PREFIX}/bin \
 		-D binexp=${PREFIX}/bin \
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index b5a9159ac9d..bb5ac4b9d2a 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/03/16 14:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2000/03/27 08:54:59 tron Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
@@ -17,7 +17,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www-rcd.cc.purdue.edu/~abe/
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS=		-n ${LOWER_OPSYS}
 
 SRCBALL_NAME=		${DISTNAME:S/_W$//}
diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index 1b387ed688c..d2c4b82e0dd 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/02/19 02:40:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2000/03/27 08:55:00 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	agc@netbsd.org
 HOMEPAGE=	http://www.groupsys.com/topinfo/
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
+CONFIGURE_SCRIPT=	./Configure
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index e824f3e02c2..640e767f344 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/02/22 17:43:23 veego Exp $
+# $NetBSD: Makefile,v 1.14 2000/03/27 08:55:00 tron Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 			--disable-module=auth_dbm \
 			--with-perl=${PREFIX}/bin/perl
 #			--enable-rule=EAPI --disable-module=ssl 
-CONFIGURE_SCRIPT=	configure.v6
+CONFIGURE_SCRIPT=	${WRKSRC}/configure.v6
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 BUILD_DEFS+=		USE_INET6
@@ -99,7 +99,7 @@ BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC USE_INET6
 
 post-patch:
 	@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} -f
-	@${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${CHMOD} +x ${CONFIGURE_SCRIPT}
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/apache.sh \
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index f6aded268f5..a8c4fe0bdbf 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/03/16 11:19:16 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/27 08:55:00 tron Exp $
 
 DISTNAME=	w3m-0.1.6
 CATEGORIES=	www
@@ -65,7 +65,7 @@ do-configure:
 	@yes '' | (cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
 	    INSTALL="${INSTALL_SCRIPT}"                             \
 	    CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+	    ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 pre-build:
 	@(cd ${WRKSRC}; \
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index f8247d2000f..90fe0af364c 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/07/24 21:01:17 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/03/27 08:55:00 tron Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
 
 DISTNAME=	Tix4.1.0.006
@@ -22,7 +22,7 @@ pre-configure:
 	@(cd ${WRKSRC}/.. && \
 	    CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
 	    INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	  ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+	  ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 post-install:
 	@(cd ${WRKSRC}/.. && \