--- scripts/mysql_install_db.sh.orig	Fri Jan  1 15:33:33 1999
+++ scripts/mysql_install_db.sh	Wed Jan  6 00:10:55 1999
@@ -13,8 +13,8 @@
 execdir=@libexecdir@
 bindir=@bindir@
 
-# Are we doing an rpm install?
-if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
+# pretend we're doing an RPM install
+IN_RPM=1
 
 # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
 if test -w /
@@ -57,8 +57,6 @@
   fi
 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
 
 # Check if hostname is valid
@@ -74,14 +72,11 @@
 fi
 
 # Create database directories mysql & test
-if test -z "$IN_RPM"
-then
-  if test ! -d $ldata; then mkdir $ldata; fi
-  if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
-  if test ! -d $ldata/test; then mkdir $ldata/test; fi
-  if test -w / -a ! -z "$user"; then
-    chown $user $ldata $ldata/mysql $ldata/test;
-  fi
+if test ! -d $ldata; then mkdir $ldata; fi
+if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
+if test ! -d $ldata/test; then mkdir $ldata/test; fi
+if test -w / -a ! -z "$user"; then
+  chown $user $ldata $ldata/mysql $ldata/test;
 fi
 
 # Initialize variables