From c1c368bb2c910f24e78ff810741f3e32b6f991cb Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 20 Dec 2013 16:06:54 -0800
Subject: Always copy man/* and doc/tools/*.

---
 build.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 3bee6eab6f..5781b609b4 100755
--- a/build.xml
+++ b/build.xml
@@ -1596,21 +1596,22 @@ TODO:
         <genman command="fsc, scala, scalac, scaladoc, scalap"
                 htmlout="${dist.dir}/doc/tools"
                 manout="${build-manual.dir}/genman"/>
-        <!-- On Windows source and target files can't be the same ! -->
-        <fixcrlf
-          srcdir="${build-manual.dir}/genman"
-          destdir="${dist.dir}/man"
-          eol="unix" includes="**/*.1"/>
-        <copy todir="${dist.dir}/doc/tools" overwrite="true">
-          <fileset dir="${src.dir}/manual/scala/tools/docutil/resources">
-            <include name="**/*.html"/>
-            <include name="**/*.css"/>
-            <include name="**/*.gif"/>
-            <include name="**/*.png"/>
-          </fileset>
-        </copy>
       </do>
     </staged-uptodate>
+
+    <!-- On Windows source and target files can't be the same ! -->
+    <fixcrlf
+      srcdir="${build-manual.dir}/genman"
+      destdir="${dist.dir}/man"
+      eol="unix" includes="**/*.1"/>
+    <copy todir="${dist.dir}/doc/tools" overwrite="true">
+      <fileset dir="${src.dir}/manual/scala/tools/docutil/resources">
+        <include name="**/*.html"/>
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.png"/>
+      </fileset>
+    </copy>
   </target>
 
   <!-- lib/ and src/ (jars: classes and sources) -->
-- 
cgit v1.2.3