You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/01/15 22:47:34 UTC

git commit: updated refs/heads/1994-merge-rcouch to 6616e1d

Updated Branches:
  refs/heads/1994-merge-rcouch d526828ee -> 6616e1d56


fix path


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6616e1d5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6616e1d5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6616e1d5

Branch: refs/heads/1994-merge-rcouch
Commit: 6616e1d5696f9142b0ccfabbb6128fdcd4142569
Parents: d526828
Author: Benoit Chesneau <be...@apache.org>
Authored: Wed Jan 15 22:40:36 2014 +0100
Committer: Benoit Chesneau <be...@apache.org>
Committed: Wed Jan 15 22:40:36 2014 +0100

----------------------------------------------------------------------
 apps/couch_collate/build_icu.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6616e1d5/apps/couch_collate/build_icu.sh
----------------------------------------------------------------------
diff --git a/apps/couch_collate/build_icu.sh b/apps/couch_collate/build_icu.sh
index e6ba834..167e73d 100755
--- a/apps/couch_collate/build_icu.sh
+++ b/apps/couch_collate/build_icu.sh
@@ -21,7 +21,7 @@ DISTDIR=$CORE_TOP/.dists
 ICU_VER=4.4.2
 ICU_DISTNAME=icu4c-4_4_2-src.tgz
 ICU_SITE=http://dl.refuge.io
-ICUDIR=$STATICLIBS/icu_src/icu
+ICUDIR=$STATICLIBS/icu
 
 
 [ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
@@ -82,10 +82,10 @@ build_icu()
     rm -rf $STATICLIBS/icu*
 
     cd $STATICLIBS
-    $GUNZIP -c $DISTDIR/$ICU_DISTNAME | $TAR xf - -C $STATICLIBS/icu_src
+    $GUNZIP -c $DISTDIR/$ICU_DISTNAME | $TAR xf -
 
     # apply patches
-    cd $STATICLIBS/icu_src
+    cd $STATICLIBS/icu
     for P in $PATCHES/icu/*.patch; do \
         (patch -p0 -i $P || echo "skipping patch"); \
     done