--- trunk/include/multilib.sminc	2014/08/22 12:29:21	22067
+++ trunk/include/multilib.sminc	2017/10/12 11:37:16	29792
@@ -7,6 +7,9 @@
 # be verbose or nor (true|false}
 : ${MULTILIB_VERBOSE="true"}
 
+# enter SRCDIR of each abi an abi runs
+: ${ABI_DO_NOT_ENTER_SRCDIR="true"}
+
 # multilib should call all dependant includes, which gets overridden
 sminclude mtools
 
@@ -42,10 +45,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
 
@@ -182,7 +185,10 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+			if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
+			then
+				cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+			fi
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -203,7 +209,10 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+			if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
+			then
+				cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+			fi
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -217,7 +226,10 @@
 	local abi
 	for abi in ${MULTILIB_ABIS}
 	do
-		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
+		then
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		fi
 		abi-${abi} $@ || die
 	done
 }
@@ -301,7 +313,7 @@
 		then
 			cd ${BUILDDIR}/build-${abi}
 		else
-			cd ${SRCDIR}-${abi}
+			cd ${SRCDIR}
 		fi
 		abi-${abi} oldcmake_configure $@ || die
 	done