Revert most of my last changes - one part has been wrong (pointed out

by Peter) and one part doesn't work anyway, so we can leave it as it was.


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

build.xml

@@ -214,15 +214,6 @@
   -->
   <target name="compile" depends="prepare">
 
-    <javac srcdir="${build.src}"
-           destdir="${build.classes}"
-           debug="${debug}"
-           deprecation="${deprecation}"
-           optimize="${optimize}" >
-      <classpath refid="classpath" />
-      <include name="${constants.file}" />
-    </javac>
-
     <javac srcdir="${java.dir}"
            destdir="${build.classes}"
            debug="${debug}"
@@ -259,7 +250,7 @@
       <exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
     </javac>
 
-    <copy file="${java.dir}/${ant.package}/defaultManifest.mf"
+    <copy file="${build.src}/${ant.package}/defaultManifest.mf"
           todir="${build.classes}/${ant.package}" />
           
     <copy file="${java.dir}/${ant.package}/taskdefs/defaults.properties"