Description: Use debian.build.classpath property
 for classpath of javac.
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2011-03-05
Forwarded: not-needed
--- a/plugins/tomcat/build.xml
+++ b/plugins/tomcat/build.xml
@@ -14,14 +14,15 @@
 	    <property name="classes.dir" value="bin"/>
 	    <property name="dist.dir" value="."/>
 	       
-	    <path id="project.classpath">
-	        <fileset dir="${red5.root}/lib"/>
-	        <pathelement location="${red5.root}/boot.jar"/>
-	        <pathelement location="${red5.root}/red5.jar"/>
-	        <!-- project specific libs -->
-	        <fileset dir="lib"/>
-	    </path>    
-	       
+        <path id="debian.build.classpath.id">
+                <pathelement path="${debian.build.classpath}"/>
+        </path>
+        <path id="project.classpath">
+                <path refid="debian.build.classpath.id" />
+                <pathelement location="${red5.root}/boot.jar"/>
+                <pathelement location="${red5.root}/red5.jar"/>
+        </path>
+
 	    <target name="prepare">
 	        <mkdir dir="${classes.dir}"/>
 	    </target>
@@ -39,7 +40,7 @@
 	        <ivy:retrieve conf="default" pattern="${basedir}/lib/[artifact](-[revision]).[ext]"/>
 	    </target>      
 	    
-	    <target name="compile" depends="prepare, retrieve">
+	    <target name="compile" depends="prepare">
 	        <condition property="java.target_version" value="1.6">
 	            <not>
 	                <isset property="java.target_version"/>