1.1 --- a/scripts/build/libc/uClibc.sh	Sun Jan 04 22:17:53 2009 +0000
     1.2 +++ b/scripts/build/libc/uClibc.sh	Sat Jan 31 17:38:26 2009 +0000
     1.3 @@ -12,18 +12,23 @@
     1.4      # later...
     1.5      CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src}
     1.6      # uClibc locales
     1.7 -    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true
     1.8 +    if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
     1.9 +        CT_GetFile "uClibc-locale-030818" ${libc_src}
    1.10 +    fi
    1.11  
    1.12      return 0
    1.13  }
    1.14  
    1.15  # Extract uClibc
    1.16  do_libc_extract() {
    1.17 -    CT_ExtractAndPatch "uClibc-${CT_LIBC_VERSION}"
    1.18 +    CT_Extract "uClibc-${CT_LIBC_VERSION}"
    1.19 +    CT_Patch "uClibc-${CT_LIBC_VERSION}"
    1.20 +
    1.21      # uClibc locales
    1.22      if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
    1.23 -        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
    1.24 -        CT_ExtractAndPatch "uClibc-locale-030818" nochdir || true
    1.25 +        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
    1.26 +        CT_Extract "uClibc-locale-030818" nochdir
    1.27 +        CT_Patch "uClibc-locale-030818" nochdir
    1.28          CT_Popd
    1.29      fi
    1.30