From af78fe2a58f112c2a89d5731461dff8b59b19647 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Fri, 10 Apr 2015 19:02:43 +0200
Subject: server-tools: change destination to separate tools directory

---
 build.ant                    | 12 ++++++------
 src/local/server-tools/rz.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.ant b/build.ant
index 58a362b2..095b1cc9 100644
--- a/build.ant
+++ b/build.ant
@@ -135,13 +135,13 @@
                      includes="*" />
          </copy>
 
-      </parallel>
+          <!-- tools. use cp to preserve permissions (copy doesn't).
+               out of parallel so ${targetDeploymentDir}/bin is already created -->
+          <exec executable="cp" failonerror="true">
+             <arg line="-R src/local/server-tools ${targetDeploymentDir}/tools"/>
+          </exec>
 
-      <!-- tools. use cp to preserve permissions (copy doesn't).
-           out of parallel so ${targetDeploymentDir}/bin is already created -->
-      <exec executable="cp" failonerror="true">
-         <arg line="-R src/local/server-tools ${targetDeploymentDir}/bin/tools"/>
-      </exec>
+      </parallel>
 
    </target>
 
diff --git a/src/local/server-tools/rz.py b/src/local/server-tools/rz.py
index 158be707..001512b8 100644
--- a/src/local/server-tools/rz.py
+++ b/src/local/server-tools/rz.py
@@ -4,7 +4,7 @@ import os
 
 # to work both from source dir and from deployment dir
 path = None
-for postfix in [['..'], ['..', '..', 'server']]:
+for postfix in [['..', 'bin'], ['..', '..', 'server']]:
     candidate = os.path.join(*([os.path.dirname(__file__)] + postfix))
     if os.path.exists(candidate):
         path = candidate
-- 
cgit v1.3.1