diff options
| author |   espie <espie@openbsd.org> | 1999-03-01 18:44:04 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 1999-03-01 18:44:04 +0000 |
| commit | 8cca8c2b7f8df2decba6b7a75af2d91d141bc875 (patch) | |
| tree | ebd5b9b002ad0d6fbbef7036aa8a43a61c823345 | |
| parent | reflect new ioctl interfaces (diff) | |
| download | wireguard-openbsd-8cca8c2b7f8df2decba6b7a75af2d91d141bc875.tar.xz wireguard-openbsd-8cca8c2b7f8df2decba6b7a75af2d91d141bc875.zip | |
Work around some broken Configure (such as elm) which don't work correctly
when they're invoked with an absolute path.
This was introduced by the WRKBUILD/WRKSRC split.
So:
- replace default CONFIGURE with a full path, so that you can override it.
- remove leading ${WRKSRC} from the configure invocation.
- add . to the configure path.
| -rw-r--r-- | share/mk/bsd.port.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 77f2a3e4148..c98ad7b6a50 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.71 1999/02/28 23:23:47 espie Exp $ +# $OpenBSD: bsd.port.mk,v 1.72 1999/03/01 18:44:04 espie 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.71 1999/02/28 23:23:47 espie Exp $$ +FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.72 1999/03/01 18:44:04 espie Exp $$ .if defined(NEED_VERSION) _VERSION_REVISION=${FULL_REVISION:M[0-9]*.*} @@ -879,8 +879,8 @@ PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} PKGFILE?= ${PKGNAME}${PKG_SUFX} .endif -CONFIGURE_SCRIPT?= configure -CONFIGURE_ENV+= PATH=${PORTPATH} +CONFIGURE_SCRIPT?= ${WRKSRC}/configure +CONFIGURE_ENV+= PATH=.:${PORTPATH} .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --prefix=${PREFIX} @@ -1289,7 +1289,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} ${WRKSRC}/${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) + ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) .endif .if defined(USE_IMAKE) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}) |