--- trunk/include/multilib.sminc	2014/03/03 09:56:03	20987
+++ trunk/include/multilib.sminc	2014/06/11 11:10:25	21293
@@ -295,8 +295,14 @@
 	local saved_SRCDIR="${SRCDIR}"
 	for abi in ${abis_to_run}
 	do
-		cd ${BUILDDIR}/build-${abi}
 		SRCDIR="${saved_SRCDIR}-${abi}"
+		# honor inside and outside build-dir builds
+		if [ -d ${BUILDDIR}/build-${abi} ]
+		then
+			cd ${BUILDDIR}/build-${abi}
+		else
+			cd ${SRCDIR}
+		fi
 		abi-${abi} oldcmake_configure $@ || die
 	done
 	# restore SRCDIR