Changeset 17509

Timestamp:

2008-10-09T14:16:05+13:00 (16 years ago)

Author:

oranfry

Message:

do the unix compilation of search4j with 'configure, make' rather than by shell script

File:

• greenstone3/trunk/build.xml (modified) (1 diff)

greenstone3/trunk/build.xml

@@ -1243 +1243 @@
 
   <target name="compile-search4j">
+
+    <!-- windows -->
     <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j"/>
-    <exec executable="${src.packages.home}/search4j/compile.sh" os="${os.unix}" dir="${src.packages.home}/search4j"/>
+
+    <!-- unix -->
+    <exec executable="configure" os="${os.unix}" dir="${src.packages.home}/search4j"><arg line="--bindir=${basedir}/bin"/></exec>
+    <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j"/>
+
+    <!-- install -->
     <copy todir="bin"><fileset dir="${src.packages.home}/search4j" includes="search4j,search4j.exe"/></copy>
     <if><bool><istrue value="${current.os.isunix}"/></bool>
       <chmod perm="+x" file="bin/search4j"/>
     </if>
+
   </target>