diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-24 14:37:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-24 14:37:00 +0100 |
| commit | 3f28115e0ee810de2772fdc69d6965058a0b5d2f (patch) | |
| tree | a14bb01c316d353c5b6c217b7198cf4148ae50e5 /scripts | |
| parent | db39910f080534159ce8c7d55fa458365de7c3f3 (diff) | |
| parent | c068b831aca6334c6dea01fd9ff54b6140a52ef6 (diff) | |
| download | mariadb-git-3f28115e0ee810de2772fdc69d6965058a0b5d2f.tar.gz | |
5.3 merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 1 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 7c9126f0d71..053abb33b2c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -274,6 +274,7 @@ cd .. # the build for the relevant directories. # ---------------------------------------------------------------------- @MAKE@ DESTDIR=$BASE install \ + libexecdir=@prefix@/libexec \ pkglibdir=@pkglibdir@ \ pkgincludedir=@pkgincludedir@ \ pkgdatadir=@pkgdatadir@ \ diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index c05b311cc7b..fd15d7ac746 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -85,7 +85,7 @@ bindir='@bindir@' # If installed, search for the compiled in directory first (might be "lib64") pkglibdir='@pkglibdir@' pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` -fix_path pkglibdir $pkglibdir_rel lib/mysql lib +fix_path pkglibdir $pkglibdir_rel lib64/mysql lib64 lib/mysql lib plugindir='@pkgplugindir@' plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` |