summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-20 07:01:55 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-10-20 07:01:55 -0700
commit235f5ccc095da65acbedfdd472be1db099d35ba3 (patch)
tree6262c7793c1088045dfc6236628c0d1529d98ccd
parentac72c9afb55b746f3135a8b3b2dbe0a2314c393a (diff)
parentf06e833d783c0bbb15edf03e878a06b3ed139472 (diff)
downloadscala-235f5ccc095da65acbedfdd472be1db099d35ba3.tar.gz
scala-235f5ccc095da65acbedfdd472be1db099d35ba3.tar.bz2
scala-235f5ccc095da65acbedfdd472be1db099d35ba3.zip
Merge pull request #3061 from retronym/topic/fix-dist
Fix problem assembling sources and docs of modules.
-rwxr-xr-xbuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index d99f4669e0..b28e6d4e8e 100755
--- a/build.xml
+++ b/build.xml
@@ -1944,7 +1944,7 @@ TODO:
<target name="dist.doc" depends="dist.base, docs.done">
<mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
- <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true">
+ <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true" flatten="true">
<file file="${scala-xml-javadoc}"/>
<file file="${scala-parser-combinators-javadoc}"/>
</copy>
@@ -2003,7 +2003,7 @@ TODO:
<target name="dist.src" depends="dist.base">
<mkdir dir="${dist.dir}/src"/>
- <copy toDir="${dist.dir}/src" overwrite="true">
+ <copy toDir="${dist.dir}/src" overwrite="true" flatten="true">
<file file="${scala-xml-sources}"/>
<file file="${scala-parser-combinators-sources}"/>
</copy>