--- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca	2008-12-08 13:38:02.000000000 -0700
+++ gridengine/source/dist/util/sgeCA/sge_ca	2009-03-19 16:11:13.000000000 -0600
@@ -928,7 +928,10 @@
       return 1
    fi
 
-   JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar"
+   case "$ARCH" in
+   *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";;
+     *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";;
+   esac
    JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties"
 
    OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1`
@@ -1722,22 +1725,6 @@
    exit 1
 fi
 
-if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then
-    echo
-    echo "Error: The lib directory \"$ROOT_PATH/lib/$ARCH\" does not exist"
-    echo "Please verify your setup and restart this script. Exit."
-    exit 1
-fi
-
-shlib_path_name=`$ROOT_PATH/util/arch -lib`
-old_shlib_path_name=`eval echo '$'$shlib_path_name`
-if [ x$old_shlib_path_name  = x ]; then
-   eval $shlib_path_name=$ROOT_PATH/lib/$ARCH
-else
-   eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}"
-fi
-export $shlib_path_name
-
 #---------------------------------------
 # setup INFOTEXT begin
 #---------------------------------------
@@ -1776,7 +1763,7 @@
 #
 #  Check wether all needed binaries are exists
 #
-for i in adminrun openssl uidgid; do
+for i in adminrun uidgid; do
    if [ ! -x $V5UTILBIN/$i ]; then
       PrintErrorAndExit 1 "Error: Can't find binary \"%s\"" $V5UTILBIN/$i
    fi
@@ -1805,7 +1792,7 @@
 
 CAKEY=cakey.pem
 CACERT=cacert.pem
-OPENSSL=$V5UTILBIN/openssl
+OPENSSL=/usr/bin/openssl
 
 AUTO="false"
 #-----------------------------