diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-04-13 18:36:15 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-04-13 18:36:15 +0800 |
| commit | 883b888942cffae3476d05cb91b882636a1e7977 (patch) | |
| tree | 4e9607083456960d04d51c761a85448e0510cb47 /Mk | |
| parent | bc50e8ce9a6ac464a36af1dd8f90bc99a219adda (diff) | |
| download | freebsd-ports-gnome-883b888942cffae3476d05cb91b882636a1e7977.tar.gz freebsd-ports-gnome-883b888942cffae3476d05cb91b882636a1e7977.tar.zst freebsd-ports-gnome-883b888942cffae3476d05cb91b882636a1e7977.zip | |
Consistently prefer ${CONFIGURE_CMD} over ./${CONFIGURE_SCRIPT}
This also fixes SET_LATE_CONFIGURE_ARGS with custom CONFIGURE_CMD.
PR: 208294
Exp-run by: antoine
Approved by: portmgr (antoine), perl (mat)
Differential Revision: https://reviews.freebsd.org/D4158
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/perl5.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index dbeb31f7c123..0c9d189543fe 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -255,7 +255,7 @@ do-configure: fi @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ - ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .if !${_USE_PERL5:Mmodbuild*} @cd ${CONFIGURE_WRKSRC} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4824ab87f0c5..ac93f1224d25 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2603,16 +2603,16 @@ HAS_CONFIGURE= yes SET_LATE_CONFIGURE_ARGS= \ _LATE_CONFIGURE_ARGS="" ; \ if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \ - ./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \ + ${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \ fi ; \ - if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ + if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \ fi ; \ - if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ + if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ fi ; \ - if [ -z "`./${CONFIGURE_SCRIPT} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \ + if [ -z "`${CONFIGURE_CMD} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --build=${CONFIGURE_TARGET}" ; \ else \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \ |