--- commons-io-1.0.ebuild	2005-11-25 20:59:48.000000000 +0000
+++ commons-io-1.1.ebuild	2005-11-25 21:02:05.000000000 +0000
@@ -7,6 +7,7 @@
 DESCRIPTION="Commons-IO contains utility classes  , stream implementations, file filters  , and endian classes."
 HOMEPAGE="http://jakarta.apache.org/commons/io"
 SRC_URI="mirror://apache/jakarta/commons/io/source/${P}-src.tar.gz"
+S=${WORKDIR}/${P}-src
 
 LICENSE="Apache-1.1"
 SLOT="1"
@@ -25,8 +26,8 @@
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
-	mkdir -p target/lib
-	cd target/lib
+	mkdir -p build/lib
+	cd build/lib
 	use junit && java-pkg_jar-from junit
 }
 
@@ -39,10 +40,10 @@
 }
 
 src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
+	java-pkg_newjar build/${P}.jar ${PN}.jar
 
 	dodoc RELEASE-NOTES.txt
 	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && java-pkg_dohtml -r dist/docs/*
+	use doc && java-pkg_dohtml -r build/dist-build/${P}/docs/*
 	use source && java-pkg_dosrc src/java/*
 }