diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-12-14 09:42:05 +0200 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-12-14 09:42:05 +0200 |
| commit | 2ed8d82c613b831e4da8b387823a33c482ce72d3 (patch) | |
| tree | 8175b213f85abddbbbf19d7bc89ee8c7feb4976f /support-files | |
| parent | 37010dba85c5c95b067a3d30a9762191a0f4f99b (diff) | |
| parent | 834940e9be231a03da947e5f7ae564a86aa01a86 (diff) | |
| download | mariadb-git-2ed8d82c613b831e4da8b387823a33c482ce72d3.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 6dbffdc9778..1892e8b4a46 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -56,12 +56,18 @@ if test -z "$basedir" then basedir=@prefix@ bindir=@bindir@ - datadir=@localstatedir@ + if test -z "$datadir" + then + datadir=@localstatedir@ + fi sbindir=@sbindir@ libexecdir=@libexecdir@ else bindir="$basedir/bin" - datadir="$basedir/data" + if test -z "$datadir" + then + datadir="$basedir/data" + fi sbindir="$basedir/sbin" libexecdir="$basedir/libexec" fi |