--- build.xml.orig	2003-12-03 14:11:21 +1200

+++ build.xml	2003-12-03 14:57:17 +1200

@@ -41,14 +41,14 @@

     <property name="name"         value="bcel"/>

     <property name="packages"     value="org.apache.bcel.*"/>

     <property name="src.dir"      value="${basedir}/src/java"/>

-    <property name="build.dir"    value="${basedir}/bin"/>

+    <property name="build.dir"    value="${basedir}/compile"/>

     <property name="examples.dir" value="${basedir}/examples"/>

     <property name="mini.dir"     value="${examples.dir}/Mini"/>

     <property name="docs.dir"     value="${basedir}/docs"/>

     <property name="apidocs.dir"  value="${docs.dir}/api"/>

-    <property name="build.dest"   value="${build.dir}/classes"/>

-    <property name="lib.dir"      value="${basedir}/lib"/>

-    <property name="class.path"   value="${lib.dir}/Regex.jar:${build.dest}"/>

+    <property name="build.dest"   value="${basedir}/dest"/>

+    <property name="lib.dir"      value="/usr/share/java"/>

+    <property name="class.path"   value="${lib.dir}/jakarta-regexp.jar:${build.dest}"/>

     <!-- Use jikes compiler, if you don't have it comment out the next lines -->

     <!-- property name="build.compiler.emacs" value="true"/ -->

@@ -57,18 +57,19 @@

   <!-- Compile the sources -->

   <target name="compile" depends="init">

-    <mkdir dir="${build.dest}"/>

-    <javac srcdir="${src.dir}" destdir="${build.dest}" classpath="${class.path}" debug="true"/>

+    <mkdir dir="${build.dir}"/>  

+    <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${class.path}" debug="true"/>

   </target>

   <!-- Just an alias -->

   <target name="build" depends="compile"/>

   <!-- Jar the library -->

-  <target name="jar" depends="examples">

-    <jar jarfile="${build.dir}/${name}.jar" 

-         basedir="${build.dest}"

-	 manifest="${basedir}/manifest.txt"

+  <target name="jar" depends="compile">

+    <mkdir dir="${build.dest}"/>  

+    <jar jarfile="${build.dest}/${name}.jar" 

+         basedir="${build.dir}"

+	 manifest="${basedir}/MANIFEST.MF"

 	 includes="org/**,listclass.class"

     />

   </target>

@@ -88,8 +89,8 @@

              version="true"

              use="true"

              windowtitle="${name} API"

-             doctitle="${name}"

-    />

+             doctitle="${name}">	     

+    </javadoc>

   </target>

   <target name="test1" depends="examples">