--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
+++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
@@ -3,7 +3,6 @@
 # For a more info consult the file COPYRIGHT distributed with this file
 
 # This scripts creates the privilige tables db, host, user in mysql
-# It should be run from the top level installation directory
 #
 # All arguments to this script is passed to safe_mysqld
 
@@ -27,18 +26,9 @@
 
 if test ! -x @bindir@/mysqladmin
 then
-  if test "@localstatedir@" = "./data"
-  then
-    echo "Can't execute @bindir@/mysqladmin"
-    echo "You should be in the distribution directory when executing this script"
-    echo "Please go to the directory where you unpacked this distribution"
-    echo "and start this script with 'scripts/mysql_install_db'"
-    exit 1
-  else
     echo "Didn't find @bindir@/mysqladmin"
     echo "You should do a 'make install' before executing this script"
     exit 1
-  fi
 fi
 
 if test -f @localstatedir@/mysql/db.ISM
@@ -105,10 +95,7 @@
 
 # copy the definition files
 #
-if test "@localstatedir@" != "./data"
-then
-  cp -p ./data/mysql/*.frm @localstatedir@/mysql
-fi
+cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql
 
 @bindir@/mysql mysql <<END_OF_DATA
 # Create tables from the .frm files
@@ -149,11 +136,7 @@
   echo
   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
   echo
-  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
-  echo "directory:"
-  echo "cd bench ; run-all-tests"
-  echo
-  echo "You can also try the mysql command line tool with:"
+  echo "You can test the MySQL daemon with the mysql command line tool:"
   echo "@bindir@/mysql test"
   echo
   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"