--- smage/trunk/include/multilib.sminc	2014/10/17 08:02:42	5868
+++ smage/trunk/include/multilib.sminc	2014/10/17 08:03:03	5869
@@ -42,10 +42,10 @@
 	# the var ist decided with our common eval+echo magic
 	if [[ -z ${SDEPEND} ]]
 	then
-		SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
 	else
 		SDEPEND="${SDEPEND}
-			\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+			$(marchsdepend EMUL_LINUX_32_SDEPEND)"
 	fi
 fi
 
@@ -360,7 +360,13 @@
 
 	for abi in ${abis_to_run}
 	do
-		cd ${BUILDDIR}/build-${abi}
+		# honor inside and outside build-dir builds
+		if [ -d ${BUILDDIR}/build-${abi} ]
+		then
+			cd ${BUILDDIR}/build-${abi}
+		else
+			cd ${SRCDIR}-${abi}
+		fi
 		mmake -j1 -k check || die
 	done
 }
@@ -382,8 +388,13 @@
 
 	for abi in ${abis_to_run}
 	do
-		# install build outside of the source dir
-		cd ${BUILDDIR}/build-${abi}
+		# honor inside and outside build-dir builds
+		if [ -d ${BUILDDIR}/build-${abi} ]
+		then
+			cd ${BUILDDIR}/build-${abi}
+		else
+			cd ${SRCDIR}-${abi}
+		fi
 		abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
 	done
 }