--- trunk/core/include/multilib.sminc	2009/12/27 23:35:37	4783
+++ trunk/core/include/multilib.sminc	2010/05/19 16:20:33	5371
@@ -65,7 +65,9 @@
 	then
 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
-	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
+	# keep pkgconfig clean
+	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
+	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
 	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
 	echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
@@ -92,7 +94,9 @@
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH
+	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	# keep pkgconfig clean
+	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
 
 	# restore original settings
 	if [[ ${EMUL_LINUX_32} = true ]]
@@ -112,7 +116,9 @@
 	then
 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
-	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
+	# keep pkgconfig clean
+	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
+	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
 	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
 	echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
@@ -131,7 +137,9 @@
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH
+	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+	# keep pkgconfig clean
+	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
 }
 
 only-m32()