Updated the s3 make file for the new amazons3 branch.