HADOOP-7100. Fix build to not refer to contrib/ec2 removed by HADOOP-6811. Contributed by Todd Lipcon

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

Author: toddlipcon

CHANGES.txt

@@ -430,6 +430,9 @@ Release 0.22.0 - Unreleased
     HADOOP-7091. reloginFromKeytab() should happen even if TGT can't be found.
     (Kan Zhang via jghoman)
 
+    HADOOP-7100. Fix build to not refer to contrib/ec2 removed by HADOOP-6811
+    (todd)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -1135,7 +1135,6 @@
         <fileset dir="${dist.dir}/src/contrib/">
           <include name="*/bin/*" />
         </fileset>
-        <fileset dir="${dist.dir}/src/contrib/ec2/bin/image"/>
     </chmod>
 
   </target>
@@ -1149,15 +1148,11 @@
         <tarfileset dir="${build.dir}" mode="664">
           <exclude name="${final.name}/bin/*" />
           <exclude name="${final.name}/contrib/*/bin/*" />
-          <exclude name="${final.name}/src/contrib/ec2/bin/*" />
-          <exclude name="${final.name}/src/contrib/ec2/bin/image/*" />
           <include name="${final.name}/**" />
         </tarfileset>
         <tarfileset dir="${build.dir}" mode="755">
           <include name="${final.name}/bin/*" />
           <include name="${final.name}/contrib/*/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/image/*" />
         </tarfileset>
       </param.listofitems>
     </macro_tar>