Changeset 30758 for main

Timestamp:

2016-08-26T13:11:08+12:00 (8 years ago)

Author:

davidb

Message:

Correcting previous commit. Experiment to see if this helps the release on El Capitan compile. The issue we are looking at is that setting DYLD_LIBRARY_PATH at this point leads to a problem with java, because it now sees the libiconv that gnome-lib-minimal has, which turns out to be incompatible with JDK 1.7_79

File:

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

main/trunk/greenstone3/build.xml

@@ -390 +390 @@
     </else>
     </if>
-<!--
+
     <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool>
-        <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
+        <!--<if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
             <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/>
         <else>
@@ -398 +398 @@
         </else>
         </if>
+          -->
+        <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/>
     <else>
-        <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
+        <!--<if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
             <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}&quot;"/>
         <else>
@@ -405 +407 @@
         </else>
         </if>
+        -->
+        <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${env.LD_LIBRARY_PATH}&quot;"/>
     </else>
     </if>
--->
+
 
     <else>