mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Use the full, right paths for automake, autoconf so the error message if

Browse Source 
something goes wrong corresponds correctly to what the build depends output
said it needed.

Approved by:	kris
This commit is contained in:
Alan Eldridge 2002-12-05 22:43:22 +00:00
parent d72a393926
commit 851233d7a5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=71388
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mk/bsd.port.mk
View File

@ -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}