From 4785fc7fb570dbc77e9d5414d7506a80476a135a Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Mon, 8 Feb 2016 18:02:09 +0100
Subject: use a distinct property for the jill build dir

otherwise the build-top.dir properties of jack and jill conflict

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
 build.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 3f65836..21afb10 100644
--- a/build.xml
+++ b/build.xml
@@ -41,8 +41,8 @@
   <!-- Distributed files   -->
   <!-- ******************* -->
 
-  <property name="build-top.dir" value="${jill-project.dir}/../../jack_jill/build/jill"/>
-  <property name="jill-top-dist.dir" value="${build-top.dir}/dist" />
+  <property name="jill-build-top.dir" value="${jill-project.dir}/../../jack_jill/build/jill"/>
+  <property name="jill-top-dist.dir" value="${jill-build-top.dir}/dist" />
 
   <target name="dist-clean">
     <delete dir="${jill-top-dist.dir}"/>
@@ -86,10 +86,10 @@
   <!-- ******************* -->
   <!-- jill                -->
   <!-- ******************* -->
-  <property name="jill.build.dir" value="${build-top.dir}/build" />
-  <property name="jill.libs.dir" value="${build-top.dir}/libs" />
+  <property name="jill.build.dir" value="${jill-build-top.dir}/build" />
+  <property name="jill.libs.dir" value="${jill-build-top.dir}/libs" />
   <property name="jill.build.outdir" value="${jill.build.dir}/classes" />
-  <property name="jill.dist.dir" value="${build-top.dir}/dist" />
+  <property name="jill.dist.dir" value="${jill-build-top.dir}/dist" />
   <property name="jill.execname" value="jill.jar" />
 
   <target name="jill-clean">
@@ -172,10 +172,10 @@
   <!-- ******************* -->
   <!-- jill-api-lib        -->
   <!-- ******************* -->
-  <property name="jill-api.lib.build.dir" value="${build-top.dir}/jill-api/build/lib" />
+  <property name="jill-api.lib.build.dir" value="${jill-build-top.dir}/jill-api/build/lib" />
   <property name="jill-api.lib.build.outdir" value="${jill-api.lib.build.dir}/classes" />
-  <property name="jill-api.libs.dir" value="${build-top.dir}/jill-api/libs" />
-  <property name="jill-api.dist.dir" value="${build-top.dir}/jill-api/dist" />
+  <property name="jill-api.libs.dir" value="${jill-build-top.dir}/jill-api/libs" />
+  <property name="jill-api.dist.dir" value="${jill-build-top.dir}/jill-api/dist" />
   <property name="jill-api.lib.name" value="jill-api-lib.jar" />
 
   <target name="jill-api-lib-clean">
@@ -219,7 +219,7 @@
   <!-- ******************* -->
   <!-- jill-api            -->
   <!-- ******************* -->
-  <property name="jill-api.build.dir" value="${build-top.dir}/jill-api/build/exec" />
+  <property name="jill-api.build.dir" value="${jill-build-top.dir}/jill-api/build/exec" />
   <property name="jill-api.build.outdir" value="${jill-api.build.dir}/classes" />
   <property name="jill-api.name" value="jill-api.jar" />
 
@@ -304,9 +304,9 @@
   <!-- ******************* -->
   <!-- asm4                -->
   <!-- ******************* -->
-  <property name="asm4.build.dir" value="${build-top.dir}/asm/build" />
+  <property name="asm4.build.dir" value="${jill-build-top.dir}/asm/build" />
   <property name="asm4.build.outdir" value="${asm4.build.dir}/classes" />
-  <property name="asm4.dist.dir" value="${build-top.dir}/asm/dist" />
+  <property name="asm4.dist.dir" value="${jill-build-top.dir}/asm/dist" />
   <property name="asm4.libname" value="asm4-lib.jar" />
 
   <target name="asm4-clean">
-- 
cgit v1.1