diff -ur globus_gram_job_manager_setup-4.1.orig/setup-globus-gram-job-manager globus_gram_job_manager_setup-4.1/setup-globus-gram-job-manager
--- globus_gram_job_manager_setup-4.1.orig/setup-globus-gram-job-manager	2002-08-08 22:56:57.000000000 +0200
+++ globus_gram_job_manager_setup-4.1/setup-globus-gram-job-manager	2009-07-30 19:16:48.445707429 +0200
@@ -1,5 +1,12 @@
 #! /bin/sh
 
-. ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh
+if test -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_SH_PERL $GLOBUS_LOCATION/setup/globus/setup-globus-gram-job-manager.pl "$@"
+. ${libexecdir}/globus-sh-tools.sh
+
+${GLOBUS_SH_PERL:-perl} ${setupdir}/setup-globus-gram-job-manager.pl "$@"
diff -ur globus_gram_job_manager_setup-4.1.orig/setup-globus-gram-job-manager.pl globus_gram_job_manager_setup-4.1/setup-globus-gram-job-manager.pl
--- globus_gram_job_manager_setup-4.1.orig/setup-globus-gram-job-manager.pl	2007-08-07 18:29:06.000000000 +0200
+++ globus_gram_job_manager_setup-4.1/setup-globus-gram-job-manager.pl	2009-08-02 08:04:42.485497599 +0200
@@ -5,12 +5,7 @@
 
 if (!defined($gpath))
 {
-    $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-    die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script";
+    $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -20,13 +15,13 @@
 my $metadata =
     new Grid::GPT::Setup(package_name => "globus_gram_job_manager_setup");
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $setupdir	= "$globusdir/setup/globus";
-my $sysconfdir	= "$globusdir/etc";
-my $libexecdir	= "$globusdir/libexec";
-my $bindir	= "$globusdir/bin";
-my $sbindir	= "$globusdir/sbin";
-my $state_dir   = "$globusdir/tmp/gram_job_state";
+require Globus::Core::Paths;
+my $setupdir	= $Globus::Core::Paths::setupdir;
+my $sysconfdir	= $Globus::Core::Paths::sysconfdir;
+my $libexecdir	= $Globus::Core::Paths::libexecdir;
+my $bindir	= $Globus::Core::Paths::bindir;
+my $sbindir	= $Globus::Core::Paths::sbindir;
+my $state_dir	= $Globus::Core::Paths::tmpdir . "/gram_job_state";
 my $help	= 0;
 my $auditing_dir = '';   
 
@@ -161,7 +156,7 @@
     my ($toolkit_version);
     my $jm_conf	= "${sysconfdir}/globus-job-manager.conf";
     my $conf_file;
-    my $toolkit_version = `${globusdir}/bin/globus-version` || "unknown";
+    my $toolkit_version = `${bindir}/globus-version` || "unknown";
 
     chomp($toolkit_version);
 
@@ -175,7 +170,6 @@
     $conf_file = new IO::File(">$jm_conf") || die "open failed for $jm_conf";
 
     print $conf_file <<EOF;
-	-home \"$globusdir\"
 	-globus-gatekeeper-host $hostname
 	-globus-gatekeeper-port $gatekeeper_port
 	-globus-gatekeeper-subject \"$gatekeeper_subject\"
@@ -248,7 +242,7 @@
 
     print "Determining system information...\n";
     chomp($hostname = `${bindir}/globus-hostname`);
-    ($cpu, $manufacturer) = (split(/-/, `${sbindir}/config.guess`))[0,1];
+    ($cpu, $manufacturer) = (split(/-/, `${libexecdir}/config.guess`))[0,1];
     $uname_cmd = &lookup_shell_command("GLOBUS_SH_UNAME");
 
     chomp($os_name=`$uname_cmd -s`);
@@ -271,7 +265,7 @@
 
     $cmdvar = $_[0];
 
-    chomp($cmd = `$bindir/globus-sh-exec -e echo \\\$$cmdvar`);
+    chomp($cmd = `${bindir}/globus-sh-exec -e echo \\\$$cmdvar`);
 
     return $cmd;
 }