Fixed various bugs

diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml
index ec2f8ad..1ce854c 100644 (file)
--- a/org.gridsite.core/project/configure.properties.xml
+++ b/org.gridsite.core/project/configure.properties.xml
@@ -4,6 +4,6 @@
 
        <project name="configure options">
         <property name="build.make.arguments"
-               value="prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor}" HTTPD_FLAGS=${with.httpd.prefix}/include/httpd/>
+               value="prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor} HTTPD_FLAGS=-I${with.httpd.prefix}/include/httpd"/>
        </project>
 

diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties
index da633cf..b451378 100644 (file)
--- a/org.gridsite.core/project/version.properties
+++ b/org.gridsite.core/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.1.18 
+module.version=1.1.18
 module.age=1_etics

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 0b1d213..2247b23 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -45,11 +45,11 @@ export prefix=/usr/local
 endif
 
 ifndef HTTPD_FLAGS
-export HTTPD_FLAGS=/usr/include/httpd
+export HTTPD_FLAGS=-I/usr/include/httpd
 endif
 
 ifndef MYCFLAGS
-export MYCFLAGS=-I. -I../interface -I$(HTTPD_FLAGS) -I/usr/include/apr-0 -I/opt/glite/include -fPIC
+export MYCFLAGS=-I. -I../interface $(HTTPD_FLAGS) -I/usr/include/apr-0 -I/opt/glite/include -fPIC
 endif
 
 ifndef MYLDFLAGS