diff options
| -rw-r--r-- | scripts/mysql_config.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index fd15d7ac746..38cd2b6b910 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,11 +92,7 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin pkgincludedir='@pkgincludedir@' -if [ -f "$basedir/include/mysql/mysql.h" ]; then - pkgincludedir="$basedir/include/mysql" -elif [ -f "$basedir/include/mysql.h" ]; then - pkgincludedir="$basedir/include" -fi +fix_path pkgincludedir include/mysql version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' @@ -125,8 +121,11 @@ if [ -r "$pkglibdir/libmygcc.a" ]; then embedded_libs="$embedded_libs -lmygcc " fi -cflags="-I$pkgincludedir @CFLAGS@ " #note: end space! include="-I$pkgincludedir" +if [ "$basedir" != "/usr" ]; then + include="$include -I$pkgincludedir/.." +fi +cflags="$include @CFLAGS@ " #note: end space! # Remove some options that a client doesn't have to care about # FIXME until we have a --cxxflags, we need to remove -Xa |