commit c282207bcda343bd3c9c9d0b1f0d184e96b98636
author Eli Collins <eli@apache.org> Wed Jun 08 00:56:32 2011 +0000
committer Eli Collins <eli@apache.org> Wed Jun 08 00:56:32 2011 +0000
tree 4a65f476b892e7ff8a517f04787104ebfddb3c0b
parent 4f130d36b519ecf4b0a3e0096385131d6751388f

MAPREDUCE-2559. ant binary fails due to missing c++ lib dir. Contributed by Eli Collins


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

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index ba97f72..6432d13 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -278,6 +278,8 @@
     MAPREDUCE-2529. Add support for regex-based shuffle metric counting
     exceptions. (Thomas Graves via cdouglas)
 
+    MAPREDUCE-2559. ant binary fails due to missing c++ lib dir. (eli)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

build.xml

diff --git a/build.xml b/build.xml
index 060f961..f0bd5ad 100644
--- a/build.xml
+++ b/build.xml
@@ -1308,13 +1308,15 @@
     </copy> -->
 
     <copy todir="${dist.dir}/include" includeEmptyDirs="false">
-      <fileset dir="${build.dir}/c++/${build.platform}/include">
+      <fileset dir="${build.dir}/c++/${build.platform}/include" 
+               erroronmissingdir="false">
         <include name="**"/>
       </fileset>
     </copy>
 
     <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
-      <fileset dir="${build.dir}/c++/${build.platform}/lib">
+      <fileset dir="${build.dir}/c++/${build.platform}/lib"
+               erroronmissingdir="false">
         <include name="**"/>
       </fileset>
     </copy>