diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-12-05 22:43:22 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-12-05 22:43:22 +0000 |
| commit | 851233d7a5423368a5eb791c61a2c179f69bce4e (patch) | |
| tree | c42361ba0d46f8657f0208a7ad08bd6c788bf789 | |
| parent | Add a separate INDEX file for 5.0 systems. This is necessary because (diff) | |
Use the full, right paths for automake, autoconf so the error message if
something goes wrong corresponds correctly to what the build depends output
said it needed.
Approved by: kris
Notes
Notes:
svn path=/head/; revision=71388
| -rw-r--r-- | Mk/bsd.port.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7e85fdeed06e..2b9cfd3d29ce 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -982,13 +982,13 @@ use_amver= ${WANT_AUTOMAKE_VER:L} .if ${use_amver} == ${cur_amver} ACLOCAL_DIR= ${LOCALBASE}/share/aclocal AUTOMAKE_DIR= ${LOCALBASE}/share/automake -BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake +BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake WANT_AUTOCONF_VER?= ${cur_acver} .elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver} ACLOCAL_DIR= ${LOCALBASE}/share/aclocal${use_amver} AUTOMAKE_DIR= ${LOCALBASE}/share/automake${use_amver} -BUILD_DEPENDS+= automake${use_amver}:${PORTSDIR}/devel/automake${use_amver} ampath= ${LOCALBASE}/libexec/automake${use_amver}: +BUILD_DEPENDS+= ${ampath:S/://}/automake:${PORTSDIR}/devel/automake${use_amver} .if ${use_amver} == ${old_amver} AUTOMAKE_ARGS+= -i WANT_AUTOCONF_VER?=${old_acver} @@ -1013,11 +1013,11 @@ GNU_CONFIGURE?= yes use_acver= ${WANT_AUTOCONF_VER:L} .if ${use_acver} == ${cur_acver} AUTOCONF_DIR= ${LOCALBASE}/share/autoconf -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf .elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver} AUTOCONF_DIR= ${LOCALBASE}/share/autoconf${use_acver} -BUILD_DEPENDS+= autoconf${use_acver}:${PORTSDIR}/devel/autoconf${use_acver} acpath= ${LOCALBASE}/libexec/autoconf${use_acver} +BUILD_DEPENDS+= ${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver} .else # bad autoconf version BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}" .endif # ${use_acver} == ${cur_acver} |