From 72615dc18e18dabd211a684a5b395daf3373dfed Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Mon, 5 May 2008 12:13:39 +0000
Subject: corrected packaging of four distribution

---
 src/build/pack.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/build')

diff --git a/src/build/pack.xml b/src/build/pack.xml
index 1cd9ecea68..d77b797422 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -147,15 +147,17 @@ JAVA FOUR DISTRIBUTION PACKAGING
   
   <target name="fourpack-archives.tar" depends="fourpack-archives.start">
     <tar destfile="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" compression="gzip">
-      <tarfileset dir="${four-dist.dir}" prefix="scala-jvm4-${version.number}" includes="bin/**" mode="755"/>
-      <tarfileset dir="${four-dist.dir}" prefix="scala-jvm4-${version.number}" excludes="bin/**"/>
+      <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"
+        includes="bin/**" mode="755"/>
+      <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"
+        excludes="bin/**"/>
     </tar>
     <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" fileext=".md5"/>
   </target>
   
   <target name="fourpack-archives.zip" depends="fourpack-archives.tar">
     <zip destfile="${dists.dir}/archives/scala-jvm4-${version.number}.zip">
-      <zipfileset prefix="scala-jvm4-${version.number}" dir="${dist.dir}"/>
+      <zipfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"/>
     </zip>
     <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.zip" fileext=".md5"/>
   </target>
-- 
cgit v1.2.3