From 22065bc8a435d492b035518ed3535d34f2d10c55 Mon Sep 17 00:00:00 2001
From: andreas <andreas@FreeBSD.org>
Date: Sat, 27 Jul 1996 11:54:30 +0000
Subject: Fixed bug, that CONFIGURE_SCRIPT in a port's Makefile doesn't have
 any effect. The target do-configure used ${SCRIPTDIR}/configure instead of
 ${SCRIPTDIR}/${CONFIGURE_SCRIPT}. 	-andreas

---
 share/mk/bsd.port.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index d987d68..7bcf259 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -3,7 +3,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.215 1996/06/26 21:12:28 gpalmer Exp $
+# $Id: bsd.port.mk,v 1.216 1996/07/05 06:12:12 jkh Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -685,12 +685,12 @@ do-patch:
 
 .if !target(do-configure)
 do-configure:
-	@if [ -f ${SCRIPTDIR}/configure ]; then \
+	@if [ -f ${SCRIPTDIR}/${CONFIGURE_SCRIPT} ]; then \
 		cd ${.CURDIR} && ${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR}\
 		  WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
 		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
 		  PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} DEPENDS="${DEPENDS}" \
-		  X11BASE=${X11BASE} /bin/sh ${SCRIPTDIR}/configure; \
+		  X11BASE=${X11BASE} /bin/sh ${SCRIPTDIR}/${CONFIGURE_SCRIPT}; \
 	fi
 .if defined(HAS_CONFIGURE)
 	@(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
-- 
cgit v1.1