Changeset 19933

Timestamp:

2009-06-26T15:49:00+12:00 (15 years ago)

Author:

kjdon

Message:

added a bindir arg to common-src configure

File:

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

greenstone3/trunk/build.xml

@@ -143 +143 @@
       <os family="unix"/>
       <not>
-  <os family="mac"/>
+    <os family="mac"/>
       </not>
     </and>
@@ -156 +156 @@
   </condition>
 
+  <!-- is there a better way to do this?? what about solaris?? -->
+  <condition property="os.bin.dir" value="windows">
+    <os family="windows"/>
+  </condition>
+  <condition property="os.bin.dir" value="darwin">
+    <os family="mac"/>
+  </condition>
+  <condition property="os.bin.dir" value="linux">
+    <and>
+      <os family="unix"/>
+      <not>
+    <os family="mac"/>
+      </not>
+    </and>
+  </condition>
+  
+  
   <condition property="collection.building.disabled">
     <isset property="disable.collection.building"/>
@@ -1213 +1230 @@
       dir="${common.src.home}" failonerror="true">
       <arg value="--prefix=${gs2build.home}"/> <!-- what value to use?? -->
+      <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? -->
       <arg line="${static.arg}"/>
     </exec>