4 files changed, 14 insertions, 14 deletions
diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index 1875a23..c8f34c0 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -94,7 +94,7 @@ do_libc_get() {
 # Extract eglibc
 do_libc_extract() {
     CT_Extract "eglibc-${CT_LIBC_VERSION}"
-    CT_Patch "eglibc-${CT_LIBC_VERSION}"
+    CT_Patch "eglibc" "${CT_LIBC_VERSION}"
 
     # C library addons
     for addon in $(do_libc_add_ons_list " "); do
@@ -110,7 +110,7 @@ do_libc_extract() {
         # directory, returns true!
         [ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
         [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
-        CT_Patch nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
+        CT_Patch nochdir "eglibc" "${addon}-${CT_LIBC_VERSION}"
         CT_Popd
     done
 
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 233cd3b..a45aef9 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -38,7 +38,7 @@ do_libc_extract() {
     CT_Extract "glibc-${CT_LIBC_VERSION}"
 
     CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
-    CT_Patch nochdir "glibc-${CT_LIBC_VERSION}"
+    CT_Patch nochdir "glibc" "${CT_LIBC_VERSION}"
 
     # C library addons
     for addon in "${addons_list[@]}"; do
@@ -54,7 +54,7 @@ do_libc_extract() {
         # directory, returns true!
         [ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
         [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
-        CT_Patch nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
+        CT_Patch nochdir "glibc" "${addon}-${CT_LIBC_VERSION}"
     done
 
     # The configure files may be older than the configure.in files
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index c4cf654..23c6d84 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -5,11 +5,11 @@
 # Edited by Martin Lund <mgl@doredevelopment.dk>
 #
 
-libc_newlib_basename() {
+libc_newlib_version() {
     if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
-        echo "newlib-${CT_LIBC_VERSION}"
+        echo "${CT_LIBC_VERSION}"
     else
-        echo "newlib-cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
+        echo "cvs${CT_LIBC_VERSION:+-${CT_LIBC_VERSION}}"
     fi
 }
 
@@ -20,11 +20,11 @@ do_libc_get() {
     if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
         CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
     else
-        CT_GetCVS "$(libc_newlib_basename)"                         \
+        CT_GetCVS "newlib-$(libc_newlib_version)"                   \
                   ":pserver:anoncvs@sources.redhat.com:/cvs/src"    \
                   "newlib"                                          \
                   "${CT_LIBC_VERSION}"                              \
-                  "$(libc_newlib_basename)=src"
+                  "newlib-$(libc_newlib_version)=src"
     fi
 
     if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
@@ -33,8 +33,8 @@ do_libc_get() {
 }
 
 do_libc_extract() {
-    CT_Extract "$(libc_newlib_basename)"
-    CT_Patch "$(libc_newlib_basename)"
+    CT_Extract "newlib-$(libc_newlib_version)"
+    CT_Patch "newlib" "$(libc_newlib_version)"
 
     if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
         CT_Extract "avr32headers"
@@ -71,7 +71,7 @@ do_libc() {
     AR=${CT_TARGET}-ar                                  \
     RANLIB=${CT_TARGET}-ranlib                          \
     CT_DoExecLog ALL                                    \
-    "${CT_SRC_DIR}/$(libc_newlib_basename)/configure"   \
+    "${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \
         --host=${CT_BUILD}                              \
         --target=${CT_TARGET}                           \
         --prefix=${CT_PREFIX_DIR}
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 009fd14..f4aa43d 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -22,13 +22,13 @@ do_libc_get() {
 # Extract uClibc
 do_libc_extract() {
     CT_Extract "uClibc-${CT_LIBC_VERSION}"
-    CT_Patch "uClibc-${CT_LIBC_VERSION}"
+    CT_Patch "uClibc" "${CT_LIBC_VERSION}"
 
     # uClibc locales
     if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
         CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
         CT_Extract nochdir "uClibc-locale-030818"
-        CT_Patch nochdir "uClibc-locale-030818"
+        CT_Patch nochdir "uClibc" "locale-030818"
         CT_Popd
     fi