From common-commits-return-16212-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org Thu Dec 1 22:48:23 2011 Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5FB070CB for ; Thu, 1 Dec 2011 22:48:23 +0000 (UTC) Received: (qmail 37102 invoked by uid 500); 1 Dec 2011 22:48:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 37075 invoked by uid 500); 1 Dec 2011 22:48:23 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 37068 invoked by uid 99); 1 Dec 2011 22:48:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2011 22:48:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2011 22:48:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A8D52388993 for ; Thu, 1 Dec 2011 22:48:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209289 - /hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Date: Thu, 01 Dec 2011 22:48:02 -0000 To: common-commits@hadoop.apache.org From: tucu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111201224802.5A8D52388993@eris.apache.org> Author: tucu Date: Thu Dec 1 22:48:00 2011 New Revision: 1209289 URL: http://svn.apache.org/viewvc?rev=1209289&view=rev Log: Merge -r 1209285:1209286 from trunk to branch. FIXES: HADOOP-7874 Modified: hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Modified: hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml?rev=1209289&r1=1209288&r2=1209289&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Thu Dec 1 22:48:00 2011 @@ -349,7 +349,7 @@ UNTAR='tar xfBp -' LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib" if [ -d $${LIB_DIR} ] ; then - TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib" + TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native" mkdir -p $${TARGET_DIR} cd $${LIB_DIR} $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)