scripts/functions
changeset 1101 29ebc048d33f
parent 1094 c6a08b4c488c
child 1104 a781c47bb638
     1.1 --- a/scripts/functions	Tue Dec 09 22:02:20 2008 +0000
     1.2 +++ b/scripts/functions	Tue Dec 16 18:12:34 2008 +0000
     1.3 @@ -617,8 +617,8 @@
     1.4      if [ "${CT_OVERIDE_CONFIG_GUESS_SUB}" = "y" ]; then
     1.5          CT_DoLog ALL "Overiding config.guess and config.sub"
     1.6          for cfg in config_guess config_sub; do
     1.7 -            eval ${cfg}="${CT_LIB_DIR}/tools/${cfg/_/.}"
     1.8 -            [ -e "${CT_TOP_DIR}/tools/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/tools/${cfg/_/.}"
     1.9 +            eval ${cfg}="${CT_LIB_DIR}/scripts/${cfg/_/.}"
    1.10 +            [ -e "${CT_TOP_DIR}/scripts/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/scripts/${cfg/_/.}"
    1.11              # Can't use CT_DoExecLog because of the '{} \;' to be passed un-mangled to find
    1.12              find . -type f -name "${cfg/_/.}" -exec cp -v "${!cfg}" {} \; |CT_DoLog ALL
    1.13          done
    1.14 @@ -630,18 +630,18 @@
    1.15  # Two wrappers to call config.(guess|sub) either from CT_TOP_DIR or CT_LIB_DIR.
    1.16  # Those from CT_TOP_DIR, if they exist, will be be more recent than those from CT_LIB_DIR.
    1.17  CT_DoConfigGuess() {
    1.18 -    if [ -x "${CT_TOP_DIR}/tools/config.guess" ]; then
    1.19 -        "${CT_TOP_DIR}/tools/config.guess"
    1.20 +    if [ -x "${CT_TOP_DIR}/scripts/config.guess" ]; then
    1.21 +        "${CT_TOP_DIR}/scripts/config.guess"
    1.22      else
    1.23 -        "${CT_LIB_DIR}/tools/config.guess"
    1.24 +        "${CT_LIB_DIR}/scripts/config.guess"
    1.25      fi
    1.26  }
    1.27  
    1.28  CT_DoConfigSub() {
    1.29 -    if [ -x "${CT_TOP_DIR}/tools/config.sub" ]; then
    1.30 -        "${CT_TOP_DIR}/tools/config.sub" "$@"
    1.31 +    if [ -x "${CT_TOP_DIR}/scripts/config.sub" ]; then
    1.32 +        "${CT_TOP_DIR}/scripts/config.sub" "$@"
    1.33      else
    1.34 -        "${CT_LIB_DIR}/tools/config.sub" "$@"
    1.35 +        "${CT_LIB_DIR}/scripts/config.sub" "$@"
    1.36      fi
    1.37  }
    1.38