From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Sep 2009 18:07:10 +0000 (+0000)
Subject: Put deps in right place - hopefully keep gump happy
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e6e066734517933d23b1f3e36997b6c89268a6f8;p=tomcat7.0

Put deps in right place - hopefully keep gump happy

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@813964 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index e0b8dfa92..c330c2a27 100644
--- a/build.xml
+++ b/build.xml
@@ -320,7 +320,7 @@
     <copy todir="${tomcat.tmp}" overwrite="yes" filtering="yes"
       encoding="ISO-8859-1">
       <filterset refid="version.filters"/>
-      <fileset dir="res/META-INF" includes="*.manifest" />
+      <fileset dir="${tomcat.home}/res/META-INF" includes="*.manifest" />
     </copy>
     
   </target>
@@ -802,8 +802,7 @@
   </target>
 
   <target name="download"
-          description="Download (and build as necessary) dependent components"
-  	      depends="build-manifests">
+          description="Download (and build as necessary) dependent components" >
 
     <antcall target="downloadfile">
       <param name="sourcefile" value="${tomcat-native.loc}"/>
@@ -880,7 +879,7 @@
 
   </target>
 
-  <target name="build-tomcat-dbcp">
+  <target name="build-tomcat-dbcp" depends="build-manifests" >
     <copy todir="${tomcat-dbcp.home}">
       <fileset dir="${commons-pool.home}">
         <include name="**/*.java" />
@@ -933,7 +932,7 @@
     </jar>
   </target>
 
-  <target name="build-jasper-jdt">
+  <target name="build-jasper-jdt" depends="build-manifests" >
     <unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
     <jar destfile="${jasper-jdt.jar}" index="true"
     	 manifest="${tomcat.tmp}/default.manifest">