--- trunk/include/meson.sminc	2018/12/03 09:18:38	31579
+++ trunk/include/meson.sminc	2019/10/21 09:58:50	33239
@@ -79,12 +79,16 @@
 		# must be escaped so the mlibdir variable gets evaluated later
 		default_opts+=' --libdir=/usr/$(mlibdir)'
 		default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
-		all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die
+		: ${MESON_SRCDIR="${SRCDIR}-$(mabi)/${SRCSUBDIR}"}
+		: ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+		all-abis meson setup ${default_opts} ${configure_opts} ${MESON_SRCDIR} ${MESON_BUILDDIR} || die
 	else
 		# the mlibdir variable gets right now evaluated
 		default_opts+=" --libdir=/usr/$(mlibdir)"
 		default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"
-		meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
+		: ${MESON_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
+		: ${MESON_BUILDDIR="${BUILDDIR}/build"}
+		meson setup ${default_opts} ${configure_opts} ${MESON_SRCDIR} ${MESON_BUILDDIR} || die
 	fi
 }
 
@@ -101,10 +105,14 @@
 		for abi in ${abis_to_run}
 		do
 			echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
-			abi-${abi} ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
+			: ${MESON_SRCDIR="${SRCDIR}-$(mabi)/${SRCSUBDIR}"}
+			: ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+			abi-${abi} ninja -C ${MESON_SRCDIR} -C ${MESON_BUILDDIR} -v ${MAKEOPTS} "$@"
 		done
 	else
-		ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
+		: ${MESON_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
+		: ${MESON_BUILDDIR="${BUILDDIR}/build"}
+		ninja -C ${MESON_SRCDIR} -C ${MESON_BUILDDIR} -v ${MAKEOPTS} "$@"
 	fi
 }
 
@@ -121,10 +129,12 @@
 		for abi in ${abis_to_run}
 		do
 			echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
-			abi-${abi} install -d ${BUILDDIR}/build-$(mabi) || die
+			: ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+			abi-${abi} install -d ${MESON_BUILDDIR} || die
 		done
 	else
-		install -d ${BUILDDIR}/build || die
+		: ${MESON_BUILDDIR="${BUILDDIR}/build"}
+		install -d ${MESON_BUILDDIR} || die
 	fi
 }
 
@@ -132,7 +142,8 @@
 {
 	if [[ ${MULTILIB_BUILD} != true ]]
 	then
-		cd ${SRCDIR}
+		: ${MESON_SRCDIR="${SRCDIR}"}
+		cd ${MESON_SRCDIR}
 	fi
 
 	meson_setup_builddir || die
@@ -142,7 +153,8 @@
 
 meson_src_check()
 {
-	cd ${BUILDDIR}/build
+	: ${MESON_BUILDDIR="${BUILDDIR}/build"}
+	cd ${MESON_BUILDDIR}
 	meson test || die
 }
 
@@ -155,22 +167,26 @@
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	for abi in ${abis_to_run}
 	do
-		cd ${BUILDDIR}/build-${abi}
+		: ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
+		cd ${MESON_BUILDDIR}
 		meson test || die
 	done
 }
 
 meson_src_install()
 {
-	cd ${BUILDDIR}/build
+	: ${MESON_SRCDIR="${SRCDIR}"}
+	: ${MESON_BUILDDIR="${BUILDDIR}/build"}
+
+	cd ${MESON_BUILDDIR}
 	DESTDIR=${BINDIR} ninja install || die
 
-	cd ${SRCDIR}
+	cd ${MESON_SRCDIR}
 	local i
 	for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 		FAQ LICENSE NEWS README TODO
 	do
-		if [ -f ${SRCDIR}/${i} ]
+		if [ -f ${MESON_SRCDIR}/${i} ]
 		then
 			minstalldocs ${i} || die
 		fi
@@ -186,15 +202,18 @@
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	for abi in ${abis_to_run}
 	do
-		cd ${BUILDDIR}/build-${abi}
+		: ${MESON_SRCDIR="${SRCDIR}-${abi}"}
+		: ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
+	
+		cd ${MESON_BUILDDIR}
 		DESTDIR=${BINDIR} ninja install || die
 
-		cd ${SRCDIR}-${abi}
+		cd ${MESON_SRCDIR}
 		local i
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 			FAQ LICENSE NEWS README TODO
 		do
-			if [ -f ${SRCDIR}-${abi}/${i} ]
+			if [ -f ${MESON_SRCDIR}/${i} ]
 			then
 				minstalldocs ${i} || die
 			fi