From d01c0269b8e5e467f82cd28392579c4c43fe63bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 20 Nov 2017 15:27:06 +0000 Subject: subr/pkg_{autoconf,configure,patch}.subr: reference ${PKG_BASE_DIR} instead of ${WORKDIR}. subr/pkg_build_dir.subr: {build,install} packages nested within ${PKG_BUILD_DIR}/. subr/pkg_distclean.subr: removed from repository. subr/pkg_{extract,fetch}.subr: {extract,fetch} within ${PKG_BASE_DIR}. subr/pkg_install.subr: install to ../destdir to facilitate post-installation processing. subr/pkg_setup_env.subr: set & create ${PKG_BASE_DIR}. subr/pre_subdirs.subr: always create ${PREFIX}/bin. vars/build.vars: consistently use ${PKG_{PREFIX,MAKE_INSTALL_VNAME,MAKEFLAGS_INSTALL}}. vars/env.vars, *: cleanup. --- subr/pkg_build_dir.subr | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'subr/pkg_build_dir.subr') diff --git a/subr/pkg_build_dir.subr b/subr/pkg_build_dir.subr index e9104ab2..2143e057 100644 --- a/subr/pkg_build_dir.subr +++ b/subr/pkg_build_dir.subr @@ -4,13 +4,15 @@ pkg_build_dir() { if [ -z "${PKG_BUILD_DIR}" ]; then - if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]\ - || [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\ - || [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.in" ]; then - set_build_dir "${PKG_SUBDIR}" "${PKG_BUILD_TYPE:-native}"; + if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]\ + || [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ + || [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" ]; then + PKG_BUILD_DIR="${PKG_BASE_DIR}/obj"; else - PKG_BUILD_DIR="${PKG_SUBDIR}"; + PKG_BUILD_DIR="${PKG_BASE_DIR}/${PKG_SUBDIR}"; fi; + else + PKG_BUILD_DIR="${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; fi; }; -- cgit v1.2.3