--- trunk/include/multilib.sminc	2017/10/12 11:37:16	29792
+++ trunk/include/multilib.sminc	2017/10/12 11:55:58	29795
@@ -7,9 +7,6 @@
 # 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
 
@@ -116,6 +113,10 @@
 	fi
 
 	# run any given command
+	if [[ ${MULTILIB_VERBOSE} = true ]]
+	then
+		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+	fi
 	eval $@ || die
 
 	unset ABI CC CXX ABI_LIBDIR
@@ -165,6 +166,10 @@
 	fi
 
 	# run any given command
+	if [[ ${MULTILIB_VERBOSE} = true ]]
+	then
+		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+	fi
 	eval $@ || die
 
 	unset ABI CC CXX ABI_LIBDIR
@@ -185,10 +190,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
-			then
-				cd ${SRCDIR}-${abi}/${SRCSUBDIR}
-			fi
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -209,10 +211,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
-			then
-				cd ${SRCDIR}-${abi}/${SRCSUBDIR}
-			fi
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -226,10 +225,7 @@
 	local abi
 	for abi in ${MULTILIB_ABIS}
 	do
-		if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
-		then
-			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
-		fi
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} $@ || die
 	done
 }