--- trunk/include/multilib.sminc	2012/01/15 00:02:09	9934
+++ trunk/include/multilib.sminc	2012/03/12 15:23:01	11525
@@ -4,6 +4,9 @@
 # be verbose or nor (true|false}
 : ${MULTILIB_VERBOSE="true"}
 
+# multilib should call all dependant includes, which gets overridden
+sminclude mtools
+
 # do not define EMUL_LINUX_32 after inherit of multlib !!
 # it may break i*86 builds
 
@@ -66,7 +69,8 @@
 	export ABI_LIBDIR="lib"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
-		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+		local saved_ldflags="${LDFLAGS}"
+		export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
 	# keep pkgconfig clean
 	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
@@ -85,6 +89,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
 
@@ -106,9 +112,10 @@
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	unset ABI CC CXX ABI_LIBDIR
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 
 	# restore original settings
 	if [[ ${EMUL_LINUX_32} = true ]]
@@ -126,6 +133,7 @@
 	export ABI_LIBDIR="lib64"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
+		local saved_ldflags="${LDFLAGS}"
 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
 	# keep pkgconfig clean
@@ -146,15 +154,17 @@
 			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
 
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	unset ABI CC CXX ABI_LIBDIR
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 }
 
 only-m32()
@@ -169,7 +179,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -190,7 +200,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -204,7 +214,7 @@
 	local abi
 	for abi in ${MULTILIB_ABIS}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} $@ || die
 	done
 }
@@ -234,7 +244,7 @@
 
 	for abi in ${abis_to_run}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldmconfigure $@ || die
 	done
 }
@@ -257,7 +267,7 @@
 	for abi in ${abis_to_run}
 	do
 		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldcmake_configure $@ || die
 	done
 	# restore SRCDIR
@@ -303,7 +313,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldmmake $@ || die
 	done
 }
@@ -325,7 +335,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldminstall $@ || die
 	done
 }
@@ -341,7 +351,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		make DESTDIR=${BINDIR} $@ install || die
 	done
 }
@@ -363,7 +373,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldmpatch $@ || die
 	done
 }
@@ -385,7 +395,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldmlibtoolize $@ || die
 	done
 }
@@ -407,7 +417,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldmautoreconf $@ || die
 	done
 }
@@ -430,7 +440,7 @@
 
 	for abi in ${abis_to_run}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldminstalldocs $@ || die
 	done
 }
@@ -461,7 +471,7 @@
 	local i
 	for abi in ${MULTILIB_ABIS}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 			FAQ LICENSE NEWS README TODO
 		do