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, 29 insertions, 24 deletions

diff --git a/vars/env.vars b/vars/env.vars
index 48ffa221..cf6ac9d1 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -17,45 +17,50 @@
 : ${DLCACHEDIR:=${PREFIX_ROOT}/dlcache};
 : ${WORKDIR:=${PREFIX}/tmp};
 : ${BUILD_STEPS:="disabled:always setup_vars:always setup_env:always
-	all:abstract fetch:main extract:main clone:main patch_pre:main
-	build_dir:always distclean:main work_dir:always autoconf:main patch:main
-	configure:main clean:optional build:main install_pre:main install:main
-	strip:main finish:always"};
-: ${PKG_BUILD_VARS:="BUILD_CMDLINE BUILD_DIR BUILD_STEPS_DISABLE
+	all:abstract fetch:main extract:main clone:main
+	patch_pre:main build_dir:always work_dir:always
+	autoconf:main patch:main configure:main clean:optional build:main
+	install_pre:main install:main strip:main finish:always"};
+: ${PKG_BUILD_VARS:="BASE_DIR BUILD_CMDLINE BUILD_DIR BUILD_STEPS_DISABLE
 	BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA
 	CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS
 	CONFIGURE_ARGS_EXTRA CXXFLAGS_CONFIGURE_EXTRA DISABLED
 	ENV_VARS_EXTRA INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA
 	LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA
-	LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA
-	MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_INSTALL_LIBS
-	NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR TARGET URL
-	URL_TYPE URLS_GIT VERSION"};
+	LDFLAGS_INSTALL_EXTRA MAKE_INSTALL_VNAME MAKEFLAGS_BUILD
+	MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA
+	NO_CLEAN NO_INSTALL_LIBS NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM 
+	SLIBTOOL SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"};
 : ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE GITROOT_HEAD HOME PATH SHELL TERM TARBALL_SIGN_GPG_KEY USER"};
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 
 # Default flags
-: ${BUILD_CPUS:=1};
-: ${CFLAGS_DEBUG:="-g2 -O0"};
-: ${CFLAGS_DEBUG_HOST:="-g0 -O2"};
-: ${CFLAGS_DEBUG_RUNTIME:="-g3 -O0"};
-: ${CFLAGS_RELEASE:="-g0 -O2"};
-: ${CFLAGS_RELEASE_HOST:="-g0 -O2"};
-: ${CFLAGS_RELEASE_RUNTIME:="-g0 -O2"};
-: ${CFLAGS_DEFAULT:=$(get_var_unsafe "CFLAGS_$(toupper "${BUILD}")")};
-: ${CFLAGS_DEFAULT_HOST:=$(get_var_unsafe "CFLAGS_$(toupper "${BUILD}")_HOST")};
-: ${CFLAGS_DEFAULT_RUNTIME:=$(get_var_unsafe "CFLAGS_$(toupper "${BUILD}")_RUNTIME")};
-: ${CFLAGS_CONFIGURE:=${CFLAGS_DEFAULT}};
+: ${DEFAULT_BUILD_CPUS:=1};
+: ${DEFAULT_CFLAGS_DEBUG:="-g2 -O0"};
+: ${DEFAULT_CFLAGS_DEBUG_HOST:="-g0 -O2"};
+: ${DEFAULT_CFLAGS_DEBUG_RUNTIME:="-g3 -O0"};
+: ${DEFAULT_CFLAGS_RELEASE:="-g0 -O2"};
+: ${DEFAULT_CFLAGS_RELEASE_HOST:="-g0 -O2"};
+: ${DEFAULT_CFLAGS_RELEASE_RUNTIME:="-g0 -O2"};
+: ${DEFAULT_CFLAGS:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")")};
+: ${DEFAULT_CFLAGS_CONFIGURE:=${DEFAULT_CFLAGS}};
+: ${DEFAULT_CFLAGS_HOST:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")_HOST")};
+: ${DEFAULT_CFLAGS_RUNTIME:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")_RUNTIME")};
+: ${DEFAULT_GITROOT:=git://midipix.org};
+: ${DEFAULT_GITROOT_HEAD:=git://midipix.org};
+: ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR};
 : ${DEFAULT_MAKEFLAGS_BUILD:=-j${BUILD_CPUS}};
-: ${GITROOT:=git://midipix.org};
-: ${GITROOT_HEAD:=git://midipix.org};
-: ${WGET_ARGS:="--no-check-certificate"};
+: ${DEFAULT_WGET_ARGS:="--no-check-certificate"};
 
 # Build {log,status} & tarball names
 : ${BUILD_LOG_FNAME:=${PREFIX}/build.log};
 : ${BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last};
 : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS};
-: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD HOST_TOOLCHAIN_CFLAGS_CONFIGURE NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE RUNTIME_CFLAGS_CONFIGURE LIB_PACKAGES_CFLAGS_CONFIGURE LEAF_PACKAGES_CFLAGS_CONFIGURE MINIPIX_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
+: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD
+	HOST_TOOLCHAIN_CFLAGS_CONFIGURE NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE
+	RUNTIME_CFLAGS_CONFIGURE LIB_PACKAGES_CFLAGS_CONFIGURE
+	LEAF_PACKAGES_CFLAGS_CONFIGURE MINIPIX_CFLAGS_CONFIGURE
+	PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
 : ${LOG_MSG_FAIL_COLOUR:=91};
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};