diff -Naur mysql-5.0.13-rc/mysys/default.c mysql-5.0.13-rc.fink/mysys/default.c --- mysql-5.0.13-rc/mysys/default.c 2005-09-23 04:39:57.000000000 +0900 +++ mysql-5.0.13-rc.fink/mysys/default.c 2005-10-16 02:13:52.000000000 +0900 @@ -980,6 +980,8 @@ { const char *env, **ptr= default_directories; + *ptr++= "@PREFIX@/etc/"; + #ifdef __WIN__ *ptr++= "C:/"; diff -Naur mysql-5.0.13-rc/scripts/mysqld_safe.sh mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh --- mysql-5.0.13-rc/scripts/mysqld_safe.sh 2005-09-23 04:40:24.000000000 +0900 +++ mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh 2005-10-16 02:18:56.000000000 +0900 @@ -132,22 +132,24 @@ # Second, try to find the data directory # -# Try where the binary installs put it -if test -d $MY_BASEDIR_VERSION/data/mysql -then - DATADIR=$MY_BASEDIR_VERSION/data - if test -z "$defaults" -a -r "$DATADIR/my.cnf" - then - defaults="--defaults-extra-file=$DATADIR/my.cnf" - fi -# Next try where the source installs put it -elif test -d $MY_BASEDIR_VERSION/var/mysql -then - DATADIR=$MY_BASEDIR_VERSION/var -# Or just give up and use our compiled-in default -else +# Fink's MySQL uses @PREFIX@/var/lib by default.. + +# # Try where the binary installs put it +# if test -d $MY_BASEDIR_VERSION/data/mysql +# then +# DATADIR=$MY_BASEDIR_VERSION/data +# if test -z "$defaults" -a -r "$DATADIR/my.cnf" +# then +# defaults="--defaults-extra-file=$DATADIR/my.cnf" +# fi +# # Next try where the source installs put it +# elif test -d $MY_BASEDIR_VERSION/var/mysql +# then +# DATADIR=$MY_BASEDIR_VERSION/var +# # Or just give up and use our compiled-in default +# else DATADIR=@localstatedir@ -fi +# fi if test -z "$MYSQL_HOME" then