--- trunk/include/multilib.sminc	2012/03/12 15:02:20	11522
+++ trunk/include/multilib.sminc	2012/04/18 21:46:01	11828
@@ -1,6 +1,9 @@
 # $Id$
 # multilib abis
 
+# tell the buildsystem that we are doing a multilib build
+export MULTILIB_BUILD="true"
+
 # be verbose or nor (true|false}
 : ${MULTILIB_VERBOSE="true"}
 
@@ -89,6 +92,8 @@
 		else
 			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
 		fi
+		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
 		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
 
@@ -152,6 +157,7 @@
 			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
 		fi
 		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
 		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
 
@@ -221,6 +227,31 @@
 	echo \${ABI}
 }
 
+mabi-cc()
+{
+	echo "\"gcc -\${ABI}\""
+}
+
+mabi-cxx()
+{
+	echo "\"g++ -\${ABI}\""
+}
+
+mabi-cflags()
+{
+	echo "\"\${CFLAGS}\""
+}
+
+mabi-cxxflags()
+{
+	echo "\"\${CXXFLAGS}\""
+}
+
+mabi-ldflags()
+{
+	echo "\"\${LDFLAGS}\""
+}
+
 ##
 # multilib compile functions
 ##
@@ -264,7 +295,7 @@
 	for abi in ${abis_to_run}
 	do
 		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		cd ${SRCDIR}/${SRCSUBDIR}
 		abi-${abi} oldcmake_configure $@ || die
 	done
 	# restore SRCDIR