--- grid-cert-request	2009-03-27 18:31:34.000000000 +0000
+++ grid-cert-request.new	2012-05-31 16:19:17.000000000 +0000
@@ -4,16 +4,13 @@
 # This is GT 2.2.4 grid-cert-request, with some bugfixes,
 #  a policy change in "host" handling, and different instructions
 #
-if test -z "${GLOBUS_LOCATION}"; then
-    echo ""
-    echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before"
-    echo "running this script"
-    echo ""
-    exit 1
+if [ -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ]; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh
+globus_source ${libexecdir}/globus-sh-tools.sh
 
 if [ ! -z "${GRID_SECURITY_DIR}" ] ; then
     secconfdir="${GRID_SECURITY_DIR}"
@@ -741,7 +738,7 @@
 
 #SSL related variables
 PATH=${GLOBUS_LOCATION}/bin:${PATH}
-SSL_EXEC="${GLOBUS_LOCATION}/bin/openssl"
+SSL_EXEC="${GLOBUS_LOCATION:-/usr}/bin/openssl"
 SSL_CONFIG="${secconfdir}/globus-user-ssl.conf"
 SSL_USER_CONFIG="${secconfdir}/globus-user-ssl.conf"
 SSL_HOST_CONFIG="${secconfdir}/globus-host-ssl.conf"