--- build.xml.orig	2009-06-12 21:55:56.000000000 +0200
+++ build.xml	2009-06-12 22:15:35.000000000 +0200
@@ -18,7 +18,7 @@
 	<property name="javadocdir" location="${dist}/javadoc" />
 	<property name="javadoczip" location="${dist}-javadoc.zip" />
 	<property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core, org.junit.matchers" />
-	<property name="hamcrestlib" location="lib/hamcrest-core-1.1.jar" />
+	<property name="hamcrestlib" value="${prefix}/share/java/hamcrest-core.jar;${prefix}/share/java/hamcrest-library.jar" />
 	<property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
 	
 	<target name="init">
@@ -72,8 +72,6 @@
 	
 	<target name="build" depends="versiontag">
 		<junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
-		<unjar src="${hamcrestlib}" dest="${bin}" />
-		<junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
 	</target>
 
 	<target name="jars">
@@ -106,17 +104,16 @@
 		<unjar src="${hamcrestlib}" dest="${hamcrestsrc}" />
 	</target>
 	
-	<target name="javadoc" depends="unjar.hamcrest">
+	<target name="javadoc">
 		<javadoc packagenames="${javadocpackages}"
 		         destdir="${javadocdir}"
 		         author="false"
 		         version="false"
 		         use="false"
 		         windowtitle="JUnit API"
-		         stylesheetfile="stylesheet.css"
+			 classpath="${hamcrestlib}"
 		>
 			<sourcepath location="${src}" />
-			<sourcepath location="${hamcrestsrc}" />
 		</javadoc>
 	</target>