diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
| commit | f8bfb65b132dae3472d3f4f88995e4cad7f72ebf (patch) | |
| tree | 618476ff0f99a8a0e949d7ba1bbd1699ec2374d2 /scripts | |
| parent | e42024cd0aab425822ae9bf001fb57984e2ef12c (diff) | |
| parent | 5e345281e3599c793fdea771d0f23eb19f22d601 (diff) | |
| download | mariadb-git-f8bfb65b132dae3472d3f4f88995e4cad7f72ebf.tar.gz | |
Merge 5.5->mwl248
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_config.sh | 11 | ||||
| -rwxr-xr-x | scripts/mysql_secure_installation.pl.in | 2 | ||||
| -rw-r--r-- | scripts/mysql_secure_installation.sh | 2 |
3 files changed, 7 insertions, 8 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 diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in index de549add904..188a6bd7104 100755 --- a/scripts/mysql_secure_installation.pl.in +++ b/scripts/mysql_secure_installation.pl.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- # -# Copyright (c) 2007, 2012, Oracle and/or its affiliates +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 28c631a46d5..9e9bce9fa87 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2002, 2012, Oracle and/or its affiliates +# Copyright (c) 2002, 2012, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |