From 0fb36d1b1e665b424492674aec283de852a1296a Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Wed, 29 Mar 2006 14:59:53 +0200
Subject: mysql_config.sh:   If installed, search built in lib path first,
 bug#13158

scripts/mysql_config.sh:
  If installed, search built in lib path first, bug#13158
---
 scripts/mysql_config.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 4d732485b1d..84ff518c381 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -82,10 +82,15 @@ basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
 ldata='@localstatedir@'
 execdir='@libexecdir@'
 bindir='@bindir@'
+
+# If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
-fix_path pkglibdir lib/mysql lib
+pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include
+
 version='@VERSION@'
 socket='@MYSQL_UNIX_ADDR@'
 port='@MYSQL_TCP_PORT@'
-- 
cgit v1.2.1