Changeset 22846 for main/trunk

Timestamp:

2010-09-03T14:45:09+12:00 (14 years ago)

Author:

sjm84

Message:

Added the os.dir to the support library path

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -224 +224 @@
   <if><bool><isset property="use.support.lib"/></bool>
     <if><bool><isset property="env.CFLAGS"/></bool>
-      <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CFLAGS}"/>
+      <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}"/>
       <else>
-        <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+        <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>
       </else>
     </if>
@@ -236 +236 @@
   <if><bool><isset property="use.support.lib"/></bool>
     <if><bool><isset property="env.CPPFLAGS"/></bool>
-      <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CPPFLAGS}"/>
+      <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}"/>
       <else>
-        <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+        <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>
       </else>
     </if>
@@ -248 +248 @@
   <if><bool><isset property="use.support.lib"/></bool>
     <if><bool><isset property="env.CXXFLAGS"/></bool>
-      <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CXXFLAGS}"/>
+      <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}"/>
       <else>
-        <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+        <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/>
       </else>
     </if>