From a8740d3b94cb695dd7bb3d7f0ce4a1c8d5b5d678 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 16 Nov 2006 21:27:16 +0000
Subject: [PATCH] Use distlib.dir.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@128 c613c5cb-e716-0410-b11b-feb51c14d237
---
 build.xml     |  3 ++-
 libs-incl.xml | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 0290387d..2eb1e6d5 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,8 @@
 
   <!-- import some targets to enumerate library dependencies -->
   <property name="projects.root" value="."/>
-  <property name="libs.dir" value="lib"/>
+  <property name="libs.dir"      value="lib"/>
+  <property name="distlib.dir"   value="lib"/>
   <import file="libs-incl.xml"/>
 
   <!-- declare our classpath business -->
diff --git a/libs-incl.xml b/libs-incl.xml
index 4c86b979..3171f55b 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -11,23 +11,13 @@
     <include name="${libs.dir}/velocity-1.5-dev.jar"/>
     <include name="${libs.dir}/commons-io.jar"/>
     <include name="${libs.dir}/commons-collections.jar"/>
-    <!-- these might come from lib/ -->
-    <include name="${libs.dir}/samskivert.jar"/>
-    <include name="${libs.dir}/narya-base.jar"/>
-    <include name="${libs.dir}/narya-distrib.jar"/>
-    <include name="${libs.dir}/narya-tests.jar"/>
-    <include name="${libs.dir}/nenya-cast.jar"/>
-    <include name="${libs.dir}/nenya-media.jar"/>
-    <include name="${libs.dir}/nenya-miso.jar"/>
-    <include name="${libs.dir}/nenya-rsrc.jar"/>
-    <!-- or from the build directories of the actual projects -->
-    <include name="${project.dir}/samskivert/dist/samskivert.jar"/>
-    <include name="${project.dir}/narya/dist/narya-base.jar"/>
-    <include name="${project.dir}/narya/dist/narya-distrib.jar"/>
-    <include name="${project.dir}/narya/dist/narya-tests.jar"/>
-    <include name="${project.dir}/nenya/dist/nenya-cast.jar"/>
-    <include name="${project.dir}/nenya/dist/nenya-media.jar"/>
-    <include name="${project.dir}/nenya/dist/nenya-miso.jar"/>
-    <include name="${project.dir}/nenya/dist/nenya-rsrc.jar"/>
+    <include name="${distlib.dir}/samskivert.jar"/>
+    <include name="${distlib.dir}/narya-base.jar"/>
+    <include name="${distlib.dir}/narya-distrib.jar"/>
+    <include name="${distlib.dir}/narya-tests.jar"/>
+    <include name="${distlib.dir}/nenya-cast.jar"/>
+    <include name="${distlib.dir}/nenya-media.jar"/>
+    <include name="${distlib.dir}/nenya-miso.jar"/>
+    <include name="${distlib.dir}/nenya-rsrc.jar"/>
   </fileset>
 </project>