From b4dcbaf0aeeb6c048039cd0d747416783f2c883d Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Tue, 23 Jan 2001 08:59:35 +0000
Subject: [PATCH] Added dist.base to complete all recomends of Conor

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268508 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index fde600a2c..906e066a0 100644
--- a/build.xml
+++ b/build.xml
@@ -46,6 +46,7 @@
        =================================================================== 
   -->
   <property name="dist.name" value="jakarta-${name}-${version}"/>
+  <property name="dist.base" value="."/>
 
   <property name="java.dir" value="src/main"/>
   <property name="docs.dir" value="docs"/>
@@ -353,10 +354,15 @@
 
     <chmod dir="${dist.dir}" perm="go-rwx" />
 
-    <zip zipfile="${dist.name}-bin.zip" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
-    <tar tarfile="${dist.name}-bin.tar" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
-    <gzip zipfile="${dist.name}-bin.tar.gz" src="${dist.name}-bin.tar"/>
-    <delete file="${dist.name}-bin.tar"/>
+    <zip zipfile="${dist.base}/${dist.name}-bin.zip" 
+         basedir="${dist.dir}/.." 
+         includes="${dist.dir}/**"/>
+    <tar tarfile="${dist.base}/${dist.name}-bin.tar" 
+         basedir="${dist.dir}/.." 
+         includes="${dist.dir}/**"/>
+    <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz" 
+          src="${dist.base}/${dist.name}-bin.tar"/>
+    <delete file="${dist.base}/${dist.name}-bin.tar"/>
   </target>
 
  <!--
@@ -410,15 +416,16 @@
 
     <fixcrlf srcdir="${src.dist.src}" includes="**/*.java" cr="remove"/>
     
-    <zip zipfile="${dist.name}-src.zip" 
+    <zip zipfile="${dist.base}/${dist.name}-src.zip" 
          basedir="${src.dist.dir}/.." 
          includes="${src.dist.dir}/**"/>
     <!--
-    <tar tarfile="${dist.name}-src.tar" 
+    <tar tarfile="${dist.base}/${dist.name}-src.tar" 
          basedir="${src.dist.dir}/.." 
          includes="${src.dist.dir}/**"/>
-    <gzip zipfile="${dist.name}-src.tar.gz" src="${dist.name}-src.tar"/>
-    <delete file="${dist.name}-src.tar"/>
+    <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz" 
+          src="${dist.base}/${dist.name}-src.tar"/>
+    <delete file="${dist.base}/${dist.name}-src.tar"/>
     -->
     <delete dir="${src.dist.dir}" />    
   </target>