--- jsr166/build.xml	2013/01/14 18:50:46	1.94
+++ jsr166/build.xml	2013/01/14 21:06:16	1.96
@@ -937,14 +937,13 @@
 
   <!-- jsr166e -->
 
-
   <target name="jsr166ecompile"
           depends="configure-compiler"
           description="Compiles jsr166e sources">
 
     <mkdir dir="${build.jsr166e.dir}"/>
 
-    <javac srcdir="${jsr166esrc.dir}"
+    <javac srcdir="${topsrc.dir}"
            destdir="${build.jsr166e.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
@@ -956,7 +955,7 @@
            executable="${javac7}"
            fork="true">
 
-      <include name="**/*.java"/>
+      <include name="jsr166e/**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
@@ -989,10 +988,15 @@
 
     <javadoc destdir="${build.jsr166ejavadocs.dir}"
              packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapidocs.url}"
+             link="${jdkapi7docs.url}"
              source="1.7"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+             sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
+             executable="${javadoc7}"
+             additionalparam="-XDignore.symbol.file=true" >
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+        <include name="jsr166e/**/*.java"/>
+      </fileset>
+    </javadoc>
 
   </target>