Datadir variable should not be reset, if it was

set in this script.

Datadir variable should not be reset, if it was
set in this script.
30692765 · jani@a193-229-222-105.elisa-laajakaista.fi · 96f8db34 · 30692765
Commit 30692765 authored Dec 14, 2005 by jani@a193-229-222-105.elisa-laajakaista.fi
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

support-files/mysql.server.sh support-files/mysql.server.sh +8 -2

No files found.
--- 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