From bc890a1ff2ed36e081ca6af2eb1f469db33ab6ff Mon Sep 17 00:00:00 2001
From: Grant Ingersoll <gsingers@apache.org>
Date: Tue, 22 Mar 2011 19:56:33 +0000
Subject: [PATCH] LUCENE-2952: get the proper build.dir

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1084327 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/common-build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 77b0647aad1..af4ffdae01d 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -116,6 +116,8 @@
   <property name="tests.src.dir" location="src/test"/>
   <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/>
   <property name="build.dir" location="build"/>
+  <!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
+  <property name="common.build.dir" location="${common.dir}/build"/>
   <property name="dist.dir" location="dist"/>
   <property name="maven.dist.dir" location="dist/maven"/>
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
@@ -425,9 +427,10 @@
   </target>
 
   <target name="compile-tools">
+    <echo>Common dir: ${common.dir}, build: ${build.dir}</echo>
     <compile
       srcdir="${common.dir}/src/tools/java"
-      destdir="${build.dir}/classes/tools">
+      destdir="${common.build.dir}/classes/tools">
       <classpath refid="classpath"/>
     </compile>
   </target>
@@ -717,6 +720,8 @@
     <element name="nested" implicit="yes" optional="yes"/>
 
     <sequential>
+      <echo>@{srcdir}</echo>
+      <echo>@{destdir}</echo>
       <mkdir dir="@{destdir}"/>
       <javac
         includeAntRuntime="${javac.includeAntRuntime}"