1.1 --- a/scripts/build/libc/uClibc.sh	Sun Jan 04 14:38:41 2009 +0000
     1.2 +++ b/scripts/build/libc/uClibc.sh	Sun Jan 04 22:17:53 2009 +0000
     1.3 @@ -10,7 +10,7 @@
     1.4      # For uClibc, we have almost every thing: releases, and snapshots
     1.5      # for the last month or so. We'll have to deal with svn revisions
     1.6      # later...
     1.7 -    CT_GetFile "${CT_LIBC_FILE}" ${libc_src}
     1.8 +    CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src}
     1.9      # uClibc locales
    1.10      [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true
    1.11  
    1.12 @@ -19,9 +19,13 @@
    1.13  
    1.14  # Extract uClibc
    1.15  do_libc_extract() {
    1.16 -    CT_ExtractAndPatch "${CT_LIBC_FILE}"
    1.17 +    CT_ExtractAndPatch "uClibc-${CT_LIBC_VERSION}"
    1.18      # uClibc locales
    1.19 -    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818" || true
    1.20 +    if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
    1.21 +        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
    1.22 +        CT_ExtractAndPatch "uClibc-locale-030818" nochdir || true
    1.23 +        CT_Popd
    1.24 +    fi
    1.25  
    1.26      return 0
    1.27  }
    1.28 @@ -52,7 +56,7 @@
    1.29  
    1.30      # Simply copy files until uClibc has the ablity to build out-of-tree
    1.31      CT_DoLog EXTRA "Copying sources to build dir"
    1.32 -    { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf -
    1.33 +    { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf -
    1.34  
    1.35      # Retrieve the config file
    1.36      cp "${CT_BUILD_DIR}/uClibc.config" .config
    1.37 @@ -87,7 +91,7 @@
    1.38  
    1.39      # Simply copy files until uClibc has the ablity to build out-of-tree
    1.40      CT_DoLog EXTRA "Copying sources to build dir"
    1.41 -    { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf -
    1.42 +    { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf -
    1.43  
    1.44      # Retrieve the config file
    1.45      cp "${CT_BUILD_DIR}/uClibc.config" .config
    1.46 @@ -146,7 +150,7 @@
    1.47  
    1.48      # Simply copy files until uClibc has the ablity to build out-of-tree
    1.49      CT_DoLog EXTRA "Copying sources to build dir"
    1.50 -    { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf -
    1.51 +    { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf -
    1.52  
    1.53      # Retrieve the config file
    1.54      cp "${CT_BUILD_DIR}/uClibc.config" .config