--- build.xml	Wed Sep 20 18:10:10 2006
+++ build.xml	2014-09-29 14:22:48.000000000 -0400
@@ -135,6 +135,8 @@
     </path>
 
+    <property environment="env"/>
     <path id="unittest.classpath">
       <path refid="class.path"/>
+      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
       <pathelement location="${unittest.destdir}"/>
     </path>
@@ -469,4 +471,5 @@
           <property name="destdir" value="${unittest.testevolvedir}"/>
           <reference refid="class.path" torefid="compile.classpath"/>
+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
       </ant>
     </target>
@@ -1224,5 +1227,4 @@
       <mkdir dir="${installdir}"/>
       <mkdir dir="${installdir}/docs"/>
-      <mkdir dir="${installdir}/bin"/>
       <mkdir dir="${installdir}/lib"/>
       <copy todir="${installdir}/docs">
@@ -1233,7 +1235,4 @@
       <copy todir="${installdir}/lib">
 	 <fileset dir="lib"/>
-      </copy>
-      <copy todir="${installdir}/bin">
-	 <fileset dir="bin"/>
       </copy>
     </target>