diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2006-03-10 12:29:44 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2006-03-10 12:29:44 +0000 |
| commit | 0971d07c6af4695da678765501d8e579469e8342 (patch) | |
| tree | fc4a291321cb03d2c16db72e13981b6c01389754 /eclass | |
| parent | Add upstream fix for suspend2 patched kernels (#125565). (diff) | |
| download | gentoo-2-0971d07c6af4695da678765501d8e579469e8342.tar.gz gentoo-2-0971d07c6af4695da678765501d8e579469e8342.tar.bz2 gentoo-2-0971d07c6af4695da678765501d8e579469e8342.zip | |
s/lib/$(get_libdir)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mysql_fx.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index 076ac3074898..32052c63d9b3 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -1,10 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.9 2006/03/10 11:41:39 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.10 2006/03/10 12:29:44 herbs Exp $ # Author: Francesco Riosa <vivo at gentoo.org> # Maintainer: Francesco Riosa <vivo at gentoo.org> +inherit multilib + # helper function, version (integer) may have section separated by dots # for readbility stripdots() { @@ -153,7 +155,7 @@ mysql_choose_better_version() { # THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced mysql_lib_symlinks() { local d dirlist maxdots soname sonameln other better - pushd "${ROOT}/usr/lib" &> /dev/null + pushd "${ROOT}/usr/$(get_libdir)" &> /dev/null # dirlist must contain the less significative directory left dirlist="mysql $( mysql_make_file_list mysql )" @@ -179,7 +181,7 @@ mysql_lib_symlinks() { popd &> /dev/null # "include"s and "mysql_config", needed to compile other sw - for other in "/usr/lib/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do + for other in "/usr/$(get_libdir)/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do pushd "${ROOT}${other%/*}" &> /dev/null better=$( mysql_choose_better_version "${other##*/}" ) if ! [[ -d "${other##*/}" ]] ; then |