--- trunk/include/meson.sminc	2019/10/21 13:46:00	33259
+++ trunk/include/meson.sminc	2019/10/22 12:29:09	33260
@@ -68,6 +68,8 @@
 {
 	local configure_opts="$@"
 	local default_opts
+	[[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
+	[[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
 
 	default_opts+=" --buildtype=release"
 	default_opts+=" --prefix=/usr"
@@ -96,6 +98,8 @@
 {
 	local abi
 	local abis_to_run="${MULTILIB_ABIS}"
+	[[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
+	[[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
 
 	# respect MULTILIB_ONLY_ABI variable
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
@@ -120,6 +124,7 @@
 {
 	local abi
 	local abis_to_run="${MULTILIB_ABIS}"
+	[[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
 
 	# respect MULTILIB_ONLY_ABI variable
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
@@ -140,6 +145,8 @@
 
 meson_src_compile()
 {
+	[[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
+
 	if [[ ${MULTILIB_BUILD} != true ]]
 	then
 		: ${MESON_SRCDIR="${SRCDIR}"}
@@ -153,33 +160,34 @@
 
 meson_src_check()
 {
+	[[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
+
 	: ${MESON_BUILDDIR="${BUILDDIR}/build"}
-	cd ${MESON_BUILDDIR}
-	meson test || die
+	meson test -C ${MESON_BUILDDIR} || die
 }
 
 meson_multilib_src_check()
 {
 	local abi
 	local abis_to_run="${MULTILIB_ABIS}"
+	[[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
 
 	# respect MULTILIB_ONLY_ABI variable
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	for abi in ${abis_to_run}
 	do
-		: ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
-		cd ${MESON_BUILDDIR}
-		meson test || die
+		: ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+		abi-${abi} meson test -C ${MESON_BUILDDIR} || die
 	done
 }
 
 meson_src_install()
 {
+	[[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
+
 	: ${MESON_SRCDIR="${SRCDIR}"}
-	: ${MESON_BUILDDIR="${BUILDDIR}/build"}
 
-	cd ${MESON_BUILDDIR}
-	DESTDIR=${BINDIR} ninja install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	cd ${MESON_SRCDIR}
 	local i
@@ -197,16 +205,15 @@
 {
 	local abi
 	local abis_to_run="${MULTILIB_ABIS}"
+	[[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
+
+	DESTDIR=${BINDIR} mninja install || die
 
 	# respect MULTILIB_ONLY_ABI variable
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	for abi in ${abis_to_run}
 	do
-		: ${MESON_SRCDIR="${SRCDIR}-${abi}"}
-		: ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
-	
-		cd ${MESON_BUILDDIR}
-		DESTDIR=${BINDIR} ninja install || die
+		: ${MESON_SRCDIR="${SRCDIR}-$(mabi)"}
 
 		cd ${MESON_SRCDIR}
 		local i