--- trunk/include/cmake.sminc	2017/10/17 08:55:26	29887
+++ trunk/include/cmake.sminc	2017/10/17 13:53:59	29889
@@ -2,7 +2,8 @@
 # cmake config tools
 
 SDEPEND="${SDEPEND}
-	>= dev-util/cmake-2.4.7"
+	>= dev-util/cmake-2.4.7
+	>= virtual/sed"
 
 # enables features like --enable-blah with make
 cmake_enable()
@@ -112,6 +113,15 @@
 	echo "-D${feature}=${option}"
 }
 
+cmake_libsuffix()
+{
+	local libsuffix
+
+	libsuffix="$(mlibdir)"
+	libsuffix="${libsuffix/lib}"
+	echo "${libsuffix}"
+}
+
 cmake_src_prepare()
 {
 	munpack ${SRCFILE} || die
@@ -121,8 +131,6 @@
 {
 	local configure_opts="$@"
 	local default_opts
-	local libsuffix="$(mlibdir)"
-	local libsuffix="${libsuffix/lib}"
 
 	# disable colors if requested
 	if [[ ${NOCOLORS} = true ]]
@@ -133,7 +141,7 @@
 	default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
 	default_opts+=" -DCMAKE_BUILD_TYPE=Release"
 	default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
-	default_opts+=" -DLIB_SUFFIX=${libsuffix}"
+	default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
 	default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
 
 	if [[ ${MULTILIB_BUILD} = true ]]
@@ -146,7 +154,7 @@
 		for abi in ${abis_to_run}
 		do
 			cd ${BUILDDIR}/build-${abi}
-			cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die
+			abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die
 		done
 	else
 		cd ${BUILDDIR}/build