database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51

Browse Source 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Auto merged
This commit is contained in:
unknown
2008-01-23 16:59:44 -07:00
parent dfa93b2bc2 1d772c91e0
commit 1c16f07ac4
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/make_binary_distribution.sh
View File

@@ -23,7 +23,8 @@
# Note that the structure created by this script is slightly different from # Note that the structure created by this script is slightly different from
# what a normal "make install" would produce. No extra "mysql" sub directory # what a normal "make install" would produce. No extra "mysql" sub directory
# will be created, i.e. no "$prefix/include/mysql", "$prefix/lib/mysql" or # will be created, i.e. no "$prefix/include/mysql", "$prefix/lib/mysql" or
# "$prefix/share/mysql". # "$prefix/share/mysql". This is because the build system explicitly calls
# make with pkgdatadir=<datadir>, etc.
# #
# In GNU make/automake terms # In GNU make/automake terms
# #

13
scripts/mysqld_safe.sh
View File

@@ -202,14 +202,22 @@ parse_arguments() {
# First, try to find BASEDIR and ledir (where mysqld is) # First, try to find BASEDIR and ledir (where mysqld is)
# #
if echo '@pkgdatadir@' | grep '^@prefix@' > /dev/null
then
relpkgdata=`echo '@pkgdatadir@' | sed -e 's,^@prefix@,,' -e 's,^/,,' -e 's,^,./,'`
else
# pkgdatadir is not relative to prefix
relpkgdata='@pkgdatadir@'
fi
MY_PWD=`pwd` MY_PWD=`pwd`
# Check for the directories we would expect from a binary release install # Check for the directories we would expect from a binary release install
if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld if test -f "$relpkgdata"/english/errmsg.sys -a -x ./bin/mysqld
then then
MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
# Check for the directories we would expect from a source install # Check for the directories we would expect from a source install
elif test -f ./share/mysql/english/errmsg.sys -a -x ./libexec/mysqld elif test -f "$relpkgdata"/english/errmsg.sys -a -x ./libexec/mysqld
then then
MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are
ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
@@ -219,6 +227,7 @@ else
ledir=@libexecdir@ ledir=@libexecdir@
fi fi
# #
# Second, try to find the data directory # Second, try to find the data directory
# #