diff -ur org.gridsite.core.orig/src/Makefile org.gridsite.core/src/Makefile
--- org.gridsite.core.orig/src/Makefile	2012-10-22 17:05:17.000000000 +0200
+++ org.gridsite.core/src/Makefile	2013-09-27 07:00:57.384595042 +0200
@@ -87,7 +87,7 @@
 offset=0
 
 version_info:=-version-info $(shell \
-	perl -e '$$,=":"; @F=split "\\.","$(PATCH_VERSION)"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' )
+	perl -e '$$,=":"; @F=split "\\.","$(PATCH_VERSION)"; print $$F[0]+$$F[1]+$(offset),$$F[2],$$F[1]' )
 
 ifdef OPENSSL_GLOBUS_LIBS
 PC_FILES=gridsite-openssl.pc gridsite-globus.pc
@@ -140,7 +140,7 @@
 
 libgridsite.la: $(GRIDSITE_OBJS)
 	$(LINK) -rpath $(prefix)/$(libdir) $(version_info) \
-          -o $@ $+ -lcrypto ${MYCANLLDFLAGS} $(XML2_LIBS)
+          -o $@ $+ -lcrypto $(MYCANLLDFLAGS) $(XML2_LIBS)
 
 grst_err.lo: grst_err.c ../interface/gridsite.h
 	$(COMPILE)  $(MYCFLAGS) \
@@ -219,7 +219,7 @@
 
 libgridsite_globus.la: $(GRIDSITE_OBJS)
 	$(LINK) -rpath $(prefix)/$(libdir) $(version_info) \
-         -o $@ $+ -lcrypto ${MYCANLLDFLAGS} $(XML2_LIBS)
+         -o $@ $+ -lcrypto $(MYCANLLDFLAGS) $(XML2_LIBS)
 
 endif
 
@@ -283,17 +283,19 @@
 gridsite-copy.cgi: gridsite-copy.lo libgridsite.la
 	$(LINK) -o $@ $< -L. $(CURL_LIBS) $(MYFCGILIBS) -lgridsite
 
-mod_gridsite.so: ${MOD_GRIDSITE_FILE} ${MOD_SSLPRIVATE_HEADER} \
+mod_gridsite.so: $(MOD_GRIDSITE_FILE) $(MOD_SSLPRIVATE_HEADER) \
                  libgridsite.la
-	gcc -g $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \
+	$(CC) -g $(MYCFLAGS) $(CFLAGS) $(LDFLAGS) \
+           -shared -Wl,-soname=gridsite_module \
            -I/usr/kerberos/include \
-           $(XML2_CFLAGS) -lcrypto -lssl ${MYCANLLDFLAGS} \
+           $(XML2_CFLAGS) -lcrypto -lssl $(MYCANLLDFLAGS) \
            -DVERSION=\"$(VERSION)\" -o mod_gridsite.so \
-           ${MOD_GRIDSITE_FILE} -L./.libs -lgridsite
+           $(MOD_GRIDSITE_FILE) -L./.libs -lgridsite
 
 mod_gridsite_example.so: mod_gridsite_example.c 
-	gcc -g -shared -Wl,-soname=gridsite_example_module \
-	   -fPIC $(HTTPD_FLAGS) \
+	$(CC) -g $(CFLAGS) $(LDFLAGS) \
+           -shared -Wl,-soname=gridsite_example_module \
+           -fPIC $(HTTPD_FLAGS) \
            -DVERSION=\"$(VERSION)\" -o mod_gridsite_example.so \
            mod_gridsite_example.c 
 
@@ -323,7 +325,7 @@
 
 # This target is used by make-gridsite-spec to test for FUSE include+libs
 fuse-test: fuse-test.c
-	gcc -g -lfuse fuse-test.c \
+	$(CC) -g $(CFLAGS) $(LDFLAGS) -o $@ -lfuse fuse-test.c \
           $(MYCFLAGS) $(MYLDFLAGS) $(XML2_CFLAGS) \
           -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=22
 
@@ -360,54 +362,45 @@
 endif
 
 
-DelegationService.wsdl: delegation.h
+DelegationSoapBinding.wsdl: delegation.h
 	$(GSOAPDIR)/bin/soapcpp2 -c delegation.h
 
 gridsite-delegation.cgi: grst-delegation.c delegation.h \
-                         DelegationService.wsdl libgridsite.la
-	gcc -g $(MYCFLAGS) $(MYLDFLAGS) -o gridsite-delegation.cgi \
+                         DelegationSoapBinding.wsdl libgridsite.la
+	$(CC) -g $(CFLAGS) $(MYCFLAGS) $(LDFLAGS) $(MYLDFLAGS) -o $@ \
             grst-delegation.c \
             -I/usr/kerberos/include -I. $(GSOAP_CFLAGS) \
-            -I$(GRIDSITEDIR)/include \
             -DVERSION=\"$(VERSION)\" -L./.libs \
             soapC.c soapServer.c \
             $(GSOAP_LIBS) -lgridsite
-#            -L$(GRIDSITEDIR)/$(libdir)  $(GSOAP_LIBS) \
- #           -lgridsite
 
-htproxyput: htproxyput.c delegation.h DelegationService.wsdl libgridsite.la
-	gcc -g $(MYCFLAGS) $(MYLDFLAGS) -o htproxyput \
+htproxyput: htproxyput.c delegation.h DelegationSoapBinding.wsdl libgridsite.la
+	$(CC) -g $(CFLAGS) $(MYCFLAGS) $(LDFLAGS) $(MYLDFLAGS) -o $@ \
             htproxyput.c \
             -I/usr/kerberos/include -I. \
             -g -DVERSION=\"$(VERSION)\" \
             $(GSOAPSSL_CFLAGS) \
-            -I$(GRIDSITEDIR)/include \
             -L./.libs \
-            $(STDSOAP2) \
             soapC.c soapClient.c $(GSOAPSSL_LIBS) \
             -lgridsite -lssl -lcrypto
 
 # This target is used by make-gridsite-spec to test for gSOAP include+libs
 gsoap-test: gsoap-test.c 
-	gcc -g $(MYCFLAGS) $(MYLDFLAGS) -o gsoap-test \
+	$(CC) -g $(CFLAGS) $(MYCFLAGS) $(LDFLAGS) $(MYLDFLAGS) -o $@ \
             gsoap-test.c \
             -I/usr/kerberos/include -I. \
             -g -DVERSION=\"$(VERSION)\" \
             $(GSOAPSSL_CFLAGS) \
-            -I$(GRIDSITEDIR)/include \
-            $(STDSOAP2) -L$(GRIDSITEDIR)/$(libdir) \
             $(GSOAPSSL_LIBS) -lz -lssl -lcrypto $(XML2_LIBS) -lm
 
 gridsite-storage.lo: gridsite-storage.c
 	$(COMPILE) -o $@ -c $<  $(MYCFLAGS) \
             -I/usr/kerberos/include -I.\
-            -I$(GRIDSITEDIR)/include \
             -DVERSION=\"$(VERSION)\" -L. \
             $(CURL_CFLAGS)
 
 gridsite-storage.cgi: gridsite-storage.lo libgridsite.la
 	$(LINK) $(MYLDFLAGS) -o $@ $< \
-            -L$(GRIDSITEDIR)/$(libdir) \
             -lgridsite $(CURL_LIBS)
 
 %.pc: %.pc.in