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.

1 files changed, 12 insertions, 12 deletions

diff --git a/vars/gcc.vars b/vars/gcc.vars
index 18d27fd5..bcb092ed 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -13,10 +13,10 @@ pkgp_gcc_setup_env() {
 	case "${PKG_NAME}" in
 	gcc_stage1)
 		export	cbb_neutral_libiberty=no		\
-			cbb_xgcc_for_specs="${WORKDIR}/${PKG_BUILD_DIR}/gcc/xgcc"; ;;
+			cbb_xgcc_for_specs="${PKG_BASE_DIR}/${PKG_BUILD_DIR}/gcc/xgcc"; ;;
 	gcc_stage1_cross_x86_64_w64_mingw32)
 		export	cbb_neutral_libiberty=no		\
-			cbb_xgcc_for_specs="${WORKDIR}/${PKG_BUILD_DIR}/gcc/xgcc"; ;;
+			cbb_xgcc_for_specs="${PKG_BASE_DIR}/${PKG_BUILD_DIR}/gcc/xgcc"; ;;
 	gcc_stage1_native_x86_64_w64_mingw32)
 		export	cbb_neutral_libiberty=no		\
 			cbb_xgcc_for_specs="${PKG_TARGET}-gcc"; ;;
@@ -25,7 +25,7 @@ pkgp_gcc_setup_env() {
 			sysroot_headers_suffix="${PKG_PREFIX}"; ;;
 	esac;
 	GCCTARGET_FLAGS="-DIN_TARGET_LIBRARY_BUILD --sysroot=${PKG_PREFIX} -midata";
-	GCCFLAGS="${CFLAGS:+${CFLAGS} }--include $(readlink -f "${WORKDIR}/cbb-gcc-${1}/libc/cbb-musl-pe.h")";
+	GCCFLAGS="${CFLAGS:+${CFLAGS} }--include $(readlink -f "${PKG_BASE_DIR}/cbb-gcc-${1}/libc/cbb-musl-pe.h")";
 	for __ in CFLAGS CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS CXXFLAGS_FOR_BUILD; do
 		export "${__}=${GCCFLAGS}";
 	done;
@@ -39,9 +39,9 @@ pkgp_gcc_setup_env() {
 };
 
 pkgp_gcc_configure() {
-	build_fileop rm "${WORKDIR}/${PKG_BUILD_DIR}";
-	build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}";
-	build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+	build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	"../cbb-gcc-${PKG_GCC_VERSION}/configure" "${@}"\
 		--disable-bootstrap			\
 		--disable-libmudflap			\
@@ -102,7 +102,7 @@ pkg_gcc_stage1_all() {
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
-			patch -b -d "${WORKDIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
+			patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
 		fi;
 		set_build_script_done "${PKG_NAME}" patch -configure;
 	fi;
@@ -137,7 +137,7 @@ pkg_gcc_stage1_all() {
 				--without-headers; ;;
 		esac;
 	else
-		build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
 		make ${MAKEFLAGS} all-gcc;
@@ -166,7 +166,7 @@ pkg_gcc_runtime_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
 	set_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross;
-	build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, compiler runtime.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
 		make ${MAKEFLAGS} all-target-libgcc;
@@ -183,7 +183,7 @@ pkg_gcc_libstdcpp_v3_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
 	set_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross;
-	build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, libstdc++-v3.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
 		make ${MAKEFLAGS} all-target-libstdc++-v3;
@@ -200,7 +200,7 @@ pkg_gcc_full_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
 	set_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross;
-	build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, everything else.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
 		make ${MAKEFLAGS};
@@ -240,7 +240,7 @@ pkg_gcc_native_all() {
 			--with-mpfr="${PKG_PREFIX}"		\
 			--with-sysroot=;
 	else
-		build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}";
+		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
 		make ${MAKEFLAGS} all-gcc;