Changeset 22846

Show
Ignore:
Timestamp:
03.09.2010 14:45:09 (9 years ago)
Author:
sjm84
Message:

Added the os.dir to the support library path

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r22845 r22846  
    224224  <if><bool><isset property="use.support.lib"/></bool> 
    225225    <if><bool><isset property="env.CFLAGS"/></bool> 
    226       <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CFLAGS}"/> 
     226      <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}"/> 
    227227      <else> 
    228         <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include"/> 
     228        <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 
    229229      </else> 
    230230    </if> 
     
    236236  <if><bool><isset property="use.support.lib"/></bool> 
    237237    <if><bool><isset property="env.CPPFLAGS"/></bool> 
    238       <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CPPFLAGS}"/> 
     238      <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}"/> 
    239239      <else> 
    240         <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include"/> 
     240        <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 
    241241      </else> 
    242242    </if> 
     
    248248  <if><bool><isset property="use.support.lib"/></bool> 
    249249    <if><bool><isset property="env.CXXFLAGS"/></bool> 
    250       <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CXXFLAGS}"/> 
     250      <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}"/> 
    251251      <else> 
    252         <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include"/> 
     252        <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/${os.bin.dir}/include"/> 
    253253      </else> 
    254254    </if>