Update README, include doc/licenses in distro

We forgot to copy the licenses directory to the dists/ directory,
so that they weren't included in the binary distribution.

I did some house cleaning while I was at it. We no longer distribute
ant as far as I can see (we used to for the sbt build,
but that was long since removed).

Added license for ASM, and Jansi (just to be sure).

1 files changed, 14 insertions, 9 deletions

diff --git a/build.xml b/build.xml
index c30e060360..377a0c958b 100644
--- a/build.xml
+++ b/build.xml
@@ -1861,22 +1861,27 @@ TODO:
   </target>
 
   <target name="dist.doc" depends="dist.base, docs.done">
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
+    <mkdir dir="${dist.dir}/doc"/>
+    <mkdir dir="${dist.dir}/doc/licenses"/>
+    <mkdir dir="${dist.dir}/doc/tools"/>
     <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc"/>
-    <copy file="${docs.dir}/README" toDir="${dist.dir}/doc"/>
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/api">
-      <fileset dir="${build-docs.dir}/library"/>
+    <copy file="${docs.dir}/README"  toDir="${dist.dir}/doc"/>
+    <copy                            toDir="${dist.dir}/doc/licenses">
+      <fileset dir="${docs.dir}/licenses"/>
     </copy>
-
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/tools">
+    <copy                            toDir="${dist.dir}/doc/tools">
       <fileset dir="${build-docs.dir}/manual/html"/>
     </copy>
+
+    <mkdir dir="${dist.dir}/api"/>
+    <copy toDir="${dist.dir}/api">
+      <fileset dir="${build-docs.dir}/library"/>
+    </copy>
     <copy file="${src.dir}/swing/doc/README"
-          toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"/>
+          toFile="${dist.dir}/api/README.scala-swing"/>
   </target>
 
+
   <target name="dist.man" depends="dist.base">
     <mkdir dir="${dist.dir}/man"/>
     <copy toDir="${dist.dir}/man">