--- scripts/mysql_install_db.sh.orig	Mon Jun 29 19:30:30 1998
+++ scripts/mysql_install_db.sh	Sat Oct 10 20:01:24 1998
@@ -3,42 +3,13 @@
 # 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
 
-if test ! -d "./data"
-then
-      echo "Didn't find the 'data' directory in the current directory"
-      echo "You should be in the distribution directory when executing this script"
-    if test -d "../data"
-    then
-      echo "We will now try to execute this in the parent directory;  If this doesn't"
-      echo "work please go to the directory where unpacked this distribution"
-      echo "and try again with 'scripts/mysql_install_db'"
-      echo
-      cd ..
-    else
-      echo "Please go to the directory where you unpacked this distribution"
-      echo "and start this script with 'scripts/mysql_install_db'"
-      exit 1
-    fi
-fi
-
 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
+  echo "Can't execute @bindir@/mysqladmin"
+  exit 1
 fi
 
 if test -f @localstatedir@/mysql/db.ISM
@@ -54,9 +25,6 @@
   exit 1
 fi
 
-# On IRIX hostname is in /usr/bsd so add this to the path
-PATH=$PATH:/usr/bsd
-
 hostname=`hostname`		# Install this too in the user table
 
 # create database mysql & test
@@ -105,10 +73,7 @@
 
 # copy the definition files
 #
-if test "@localstatedir@" != "./data"
-then
-  cp -p ./data/mysql/*.frm @localstatedir@/mysql
-fi
+cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql
 
 @bindir@/mysql mysql <<END_OF_DATA
 # Create tables from the .frm files
@@ -148,10 +113,6 @@
   echo "mysqld demon is running and mysql grant tables are installed."
   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 "@bindir@/mysql test"
