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

6 files changed, 17 insertions, 16 deletions

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