diff -ur globus_gridftp_server-3.15.orig/configure.in globus_gridftp_server-3.15/configure.in
--- globus_gridftp_server-3.15.orig/configure.in	2008-10-03 07:18:44.000000000 +0200
+++ globus_gridftp_server-3.15/configure.in	2009-07-28 07:08:23.568709012 +0200
@@ -80,8 +80,8 @@
 
 AC_MSG_CHECKING(Toolkit version)
 GLOBUS_TOOLKIT_ID=unknown
-if test -x ${GLOBUS_LOCATION}/bin/globus-version ; then
-    GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION}/bin/globus-version -full`"
+if test -x ${GLOBUS_LOCATION:-/usr}/bin/globus-version ; then
+    GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION:-/usr}/bin/globus-version -full`"
 fi
 AC_MSG_RESULT($GLOBUS_TOOLKIT_ID)
 AC_SUBST(GLOBUS_TOOLKIT_ID)
diff -ur globus_gridftp_server-3.15.orig/gridftp-be.gfork.in globus_gridftp_server-3.15/gridftp-be.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp-be.gfork.in	2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp-be.gfork.in	2009-07-28 09:56:35.208708536 +0200
@@ -3,18 +3,18 @@
     port = 2812
     instances = 100
     log_level = 0
-    env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
-    env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
-    env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+    env = GLOBUS_LOCATION=@prefix@
+    env += LD_LIBRARY_PATH=@libdir@
+    env += PATH=@sbindir@:@bindir@
 #   might need additional envs for security
 
-    server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
-    server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp-be.log
+    server = @sbindir@/globus-gridftp-server
+    server_args = -i -aa -l @localstatedir@/log/globus-gridftp-be.log
     server_args += -d WARN  -ia self
     nice = -20
-    master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+    master = @sbindir@/gfs-gfork-master
     master_args = -G y @GRIDMAP_CONF@
-    master_args += -l @GLOBUS_LOCATION@/gridftp-master-be.log
+    master_args += -l @localstatedir@/log/globus-gridftp-master-be.log
 
 # must set this next value properly
     master_args += -b <frontend registartion cs>
diff -ur globus_gridftp_server-3.15.orig/gridftp-fe.gfork.in globus_gridftp_server-3.15/gridftp-fe.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp-fe.gfork.in	2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp-fe.gfork.in	2009-07-28 09:54:30.635708011 +0200
@@ -3,18 +3,18 @@
     port = 2811
     instances = 100
     log_level = 0
-    env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
-    env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
-    env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+    env = GLOBUS_LOCATION=@prefix@
+    env += LD_LIBRARY_PATH=@libdir@
+    env += PATH=@sbindir@:@bindir@
 #   might need additional envs for security
 
-    server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
-    server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp-fe.log
+    server = @sbindir@/globus-gridftp-server
+    server_args = -i -aa -l @localstatedir@/log/globus-gridftp-fe.log
     server_args += -d WARN -dsi remote -ia self
     nice = -20
-    master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+    master = @sbindir@/gfs-gfork-master
     master_args = -port 2815 -G y @GRIDMAP_CONF@
-    master_args += -l @GLOBUS_LOCATION@/gridftp-master-fe.log
+    master_args += -l @localstatedir@/log/globus-gridftp-master-fe.log
 
 #   undoc the following for memory limiting
 #   master_args += -m
diff -ur --exclude pkgdata globus_gridftp_server-3.15.orig/gridftp.gfork.in globus_gridftp_server-3.15/gridftp.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp.gfork.in	2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp.gfork.in	2009-07-28 09:53:03.396707994 +0200
@@ -3,18 +3,18 @@
     port = 2811
     instances = 100
     log_level = 0
-    env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
-    env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
-    env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+    env = GLOBUS_LOCATION=@prefix@
+    env += LD_LIBRARY_PATH=@libdir@
+    env += PATH=@sbindir@:@bindir@
 #   might need additional envs for security
 
-    server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
-    server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp.log
+    server = @sbindir@/globus-gridftp-server
+    server_args = -i -aa -l @localstatedir@/log/globus-gridftp.log
     server_args += -d WARN
     nice = -20
-    master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+    master = @sbindir@/gfs-gfork-master
     master_args = -G y
-    master_args += -l @GLOBUS_LOCATION@/gridftp-master.log
+    master_args += -l @localstatedir@/log/globus-gridftp-master.log
 
 #   undoc the following for memory limiting
 #   master_args += -m
diff -ur --exclude pkgdata globus_gridftp_server-3.15.orig/Makefile.am globus_gridftp_server-3.15/Makefile.am
--- globus_gridftp_server-3.15.orig/Makefile.am	2008-03-10 20:03:13.000000000 +0100
+++ globus_gridftp_server-3.15/Makefile.am	2009-07-28 09:29:35.000708918 +0200
@@ -97,17 +97,15 @@
 # You can also use any directory defined by a macro of the form 
 # <directory_name>dir
 
-sbin_PROGRAMS= \
-	globus-gridftp-server 
-
 sbin_SCRIPTS = \
     gridftp-password.pl
 
-libexec_PROGRAMS= \
+sbin_PROGRAMS = \
+    globus-gridftp-server \
     gfs-gfork-master \
     gfs-dynbe-client
 
-scriptsysconf_SCRIPTS=\
+scriptsysconf_DATA = \
     gridftp.gfork \
     gridftp-fe.gfork \
     gridftp-be.gfork