Changeset 22868 for main/trunk


Ignore:
Timestamp:
2010-09-07T13:04:56+12:00 (14 years ago)
Author:
sjm84
Message:

Added a path environment variable to the build- and common-src configure scripts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r22854 r22868  
    223223  <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation -->
    224224  <if><bool><isset property="use.support.lib"/></bool>
    225     <if><bool><isset property="env.CFLAGS"/></bool>
     225    <if><bool><isset property="env.CFLAGS"/></bool>
    226226      <property name="cflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}"/>
    227227      <else>
    … …  
    235235
    236236  <if><bool><isset property="use.support.lib"/></bool>
    237     <if><bool><isset property="env.CPPFLAGS"/></bool>
     237    <if><bool><isset property="env.CPPFLAGS"/></bool>
    238238      <property name="cppflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}"/>
    239239      <else>
    … …  
    247247
    248248  <if><bool><isset property="use.support.lib"/></bool>
    249     <if><bool><isset property="env.CXXFLAGS"/></bool>
     249    <if><bool><isset property="env.CXXFLAGS"/></bool>
    250250      <property name="cxxflags.arg" value="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}"/>
    251251      <else>
    … …  
    259259
    260260  <if><bool><isset property="use.support.lib"/></bool>
    261     <if><bool><isset property="env.LDFLAGS"/></bool>
     261    <if><bool><isset property="env.LDFLAGS"/></bool>
    262262      <property name="ldflags.arg" value="-L${basedir}/ext/gnome-lib/${os.bin.dir}/lib ${env.LDFLAGS}"/>
    263263      <else>
    … …  
    267267    <else>
    268268      <property name="ldflags.arg" value=" "/>
     269    </else>
     270  </if>
     271
     272  <if><bool><isset property="use.support.lib"/></bool>
     273    <if><bool><isset property="env.PATH"/></bool>
     274      <property name="path.arg" value="${basedir}/ext/gnome-lib/${os.bin.dir}/bin:${env.PATH}"/>
     275      <else>
     276        <property name="path.arg" value="${basedir}/ext/gnome-lib/${os.bin.dir}/bin"/>
     277      </else>
     278    </if>
     279    <else>
     280      <property name="path.arg" value=" "/>
    269281    </else>
    270282  </if>
    … …  
    14541466      <env key="CPPFLAGS" value="${cppflags.arg}"/>
    14551467      <env key="CXXFLAGS" value="${cxxflags.arg}"/>
     1468      <env key="PATH" value="${path.arg}"/>
    14561469    </exec>
    14571470  </target>
    … …  
    17771790      <env key="CPPFLAGS" value="${cppflags.arg}"/>
    17781791      <env key="CXXFLAGS" value="${cxxflags.arg}"/>
     1792      <env key="PATH" value="${path.arg}"/>
    17791793    </exec>
    17801794  </target>
Note: See TracChangeset for help on using the changeset viewer.