From 4aa7ec183ea0f9938ced697fce3494234d14e71d Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 25 Feb 2010 00:14:04 +0000
Subject: The build file wasn't quite all the way on the ...

The build file wasn't quite all the way on the bash completion commit.
Now it should work, and also be copied into the distribution. Review by
anyone who may be cruel enough to oppose including completion in the
distribution.
---
 build.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 4a5e08a9a4..87acbf7c45 100644
--- a/build.xml
+++ b/build.xml
@@ -871,16 +871,16 @@ PACKED QUICK BUILD (PACK)
     <chmod perm="ugo+rx" file="${build-pack.dir}/bin/scaladoc"/>
     <chmod perm="ugo+rx" file="${build-pack.dir}/bin/fsc"/>
     <chmod perm="ugo+rx" file="${build-pack.dir}/bin/scalap"/>
-    <touch file="${build-pack.dir}/bin.complete" verbose="no"/>
-  </target>
 
-  <target name="pack.etc" depends="pack.bin" unless="pack.bin.available" >
+	<mkdir dir="${build-pack.dir}/etc"/>
 	<exec executable="${build-pack.dir}/bin/scala" output="${build-pack.dir}/etc/scala_completion.sh" failifexecutionfails="false" >
 	  <arg line="scala.tools.util.BashCompletion" />
     </exec>
+
+    <touch file="${build-pack.dir}/bin.complete" verbose="no"/>
   </target>
   
-  <target name="pack.done" depends="pack.etc">
+  <target name="pack.done" depends="pack.bin">
     <path id="pack.classpath">
       <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
@@ -1453,6 +1453,10 @@ DISTRIBUTION
     <chmod perm="ugo+rx" file="${dist.dir}/bin/scaladoc"/>
     <chmod perm="ugo+rx" file="${dist.dir}/bin/fsc"/>
     <chmod perm="ugo+rx" file="${dist.dir}/bin/scalap"/>
+    <mkdir dir="${dist.dir}/etc"/>
+    <copy toDir="${dist.dir}/etc">
+      <fileset dir="${build-pack.dir}/etc"/>
+    </copy>
   </target>
 
   <target name="dist.doc" depends="dist.base">
-- 
cgit v1.2.3