Changeset 30786 for main

Show
Ignore:
Timestamp:
08.09.2016 17:40:48 (3 years ago)
Author:
ak19
Message:

Trying to compile release on gilda El Capitan.

Files:
1 modified

Legend:

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

    r30759 r30786  
    392392 
    393393    <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool> 
    394         <!--<if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 
    395             <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/> 
    396         <else> 
    397             <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib&quot;"/> 
    398         </else> 
    399         </if> 
    400           --> 
    401         <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/> 
     394      <!--<if><bool><equals arg1="${env.THIS_MACHINE}" arg2="gilda"/></bool>--> 
     395      <if><bool><isset property="env.THIS_MACHINE"/></bool> 
     396        <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 
     397          <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/> 
     398          <else> 
     399        <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib&quot;"/> 
     400          </else> 
     401        </if> 
     402        <else> 
     403          <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/> 
     404        </else> 
     405      </if> 
    402406    <else> 
    403407        <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>