diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-09 19:04:59 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-09 19:04:59 -0800 |
| commit | e6578a345c807987cc6e7fb4e9504f03b36dfa00 (patch) | |
| tree | 9e0b57c6d0cea4a77c23dc87356e09a524eb268d /scripts | |
| parent | 6c1aab92d25580643595962ae61a963a3e2fbd9d (diff) | |
| parent | f92cfdb8a9ff7f8287239c39ce4735789a23e3df (diff) | |
| download | mariadb-git-e6578a345c807987cc6e7fb4e9504f03b36dfa00.tar.gz | |
Merged 5.3 changes into the mwl #248 tree.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 6 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 789f3e3ce2e..070b396a34c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -285,7 +285,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then pkgplugindir=@pkgplugindir@ \ pkgsuppdir=@pkgsuppdir@ \ mandir=@mandir@ \ - infodir=@infodir@ + infodir=@infodir@ \ + libexecdir=@prefix@/libexec # ---------------------------------------------------------------------- # Rename top directory, and set DEST to the new directory @@ -301,7 +302,10 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then if [ -z "$gcclib" ] ; then echo "Warning: Compiler doesn't tell libgcc.a!" elif [ -f "$gcclib" ] ; then + { + mkdir -p $DEST/lib $CP $gcclib $DEST/lib/libmygcc.a + } else echo "Warning: Compiler result '$gcclib' not found / no file!" fi diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index f1d46c0b2c0..ce61c09aa15 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -86,7 +86,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@' |