From 7b4c5cc839964fd826138e897e2fcace1cec21a9 Mon Sep 17 00:00:00 2001 From: ade Date: Tue, 28 Feb 2006 05:56:43 +0000 Subject: Fix build when bash is installed, by changing the (incorrect) usage of SCRIPTS_ENV to CONFIGURE_ENV. This works around the problem and makes this port build now, but there is almost certainly something very strange going on with any one of the recent updates to ports/shells/bash and it's handling of arguments passed to configure scripts, since this most definitely used to work. Detective work by: Ion-Mihai Tetcu Approved by: portmgr (implicit) --- devel/apr2/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'devel/apr2') diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 6c71689bba09..ef33fce9f6bb 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -143,16 +143,17 @@ pre-configure: .endfor run-autotools:: - cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf + cd ${WRKDIR}/apr-${PORTVERSION} ; \ + ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ - ${RM} -fr xml/expat + ${RM} -fr xml/expat cd ${WRKDIR}/apr-util-${PORTVERSION} ; \ - ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \ + ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \ --with-apr=../apr-${PORTVERSION} cd ${WRKDIR}/apr-${PORTVERSION}; \ - ${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS} + ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} cd ${WRKDIR}/apr-util-${PORTVERSION}; \ - ${SETENV} ${SCRIPTS_ENV} ${SH} \ + ${SETENV} ${CONFIGURE_ENV} ${SH} \ ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} do-configure: -- cgit