diff options
-rw-r--r-- | devel/apr/Makefile | 11 | ||||
-rw-r--r-- | devel/apr0/Makefile | 11 | ||||
-rw-r--r-- | devel/apr1/Makefile | 11 | ||||
-rw-r--r-- | devel/apr2/Makefile | 11 |
4 files changed, 24 insertions, 20 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 6c71689bba09..ef33fce9f6bb 100644 --- a/devel/apr/Makefile +++ b/devel/apr/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: diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 6c71689bba09..ef33fce9f6bb 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/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: diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 6c71689bba09..ef33fce9f6bb 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/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: 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: |