Add support for prep_ml_includes to take multiple dirs.

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index e33ac40e361e615097e6ecb119f694db34c7b1ed..329f9b60e54552421383dc1ad8a704b96ba8fb4f 100644 (file)
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.12 2005/01/17 04:17:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.13 2005/01/17 04:20:55 eradicator Exp $
 #
 # Author: Jeremy Huddleston <eradicator@gentoo.org>
 #
@@ -248,12 +248,15 @@ prep_ml_includes() {
                        pushd ${base}
                        find . | cpio -pmd --no-preserve-owner ${D}
                        popd
-                       local args
-                       for abi in $(get_abi_order); do
-                               args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
-                       done
-                       create_ml_includes ${args}
 
+                       for dir in ${dirs}; do
+                               local args=${dir}
+                               local abi
+                               for abi in $(get_abi_order); do
+                                       args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
+                               done
+                               create_ml_includes ${args}
+                       done
                fi
        fi
 }