--- trunk/include/multilib.sminc	2014/06/11 11:10:25	21293
+++ trunk/include/multilib.sminc	2014/08/22 12:04:19	22066
@@ -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}
+		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}
+		fi
 		abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
 	done
 }