summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco S Hyman <marc@cvs.openbsd.org>1999-03-03 04:16:04 +0000
committerMarco S Hyman <marc@cvs.openbsd.org>1999-03-03 04:16:04 +0000
commit81a100e675702fd43226cecb22381ff11af09f05 (patch)
treeec278304a6a38dc3a216b916f5d303a1a09ac031
parent98aa1c3b13aff0afd3324b0244e28950e795f90d (diff)
Remove . from the path passed to configure;
adjust the configure script path appropriate for SEPARATE_BUILD; this seems to work for all ports, some ports had probs with earlier changes
-rw-r--r--share/mk/bsd.port.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 49631df1ceb..303e3f0f17a 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
-# $OpenBSD: bsd.port.mk,v 1.73 1999/03/01 19:44:18 marc Exp $
+# $OpenBSD: bsd.port.mk,v 1.74 1999/03/03 04:16:03 marc Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -28,7 +28,7 @@ OpenBSD_MAINTAINER= marc@OpenBSD.ORG
# NEED_VERSION: we need at least this version of bsd.port.mk for this
# port to build
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.73 1999/03/01 19:44:18 marc Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.74 1999/03/03 04:16:03 marc Exp $$
.if defined(NEED_VERSION)
_VERSION_REVISION=${FULL_REVISION:M[0-9]*.*}
@@ -889,8 +889,13 @@ PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
PKGFILE?= ${PKGNAME}${PKG_SUFX}
.endif
-CONFIGURE_SCRIPT?= ${WRKSRC}/configure
-CONFIGURE_ENV+= PATH=.:${PORTPATH}
+CONFIGURE_SCRIPT?= configure
+.if defined(SEPARATE_BUILD)
+_CONFIGURE_SCRIPT=${WRKSRC}/${CONFIGURE_SCRIPT}
+.else
+_CONFIGURE_SCRIPT=./${CONFIGURE_SCRIPT}
+.endif
+CONFIGURE_ENV+= PATH=${PORTPATH}
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -1305,7 +1310,7 @@ do-configure: ${WRKBUILD}
INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}" \
- ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+ ${CONFIGURE_ENV} ${_CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
.endif
.if defined(USE_IMAKE)
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF})