diff -r c6a08b4c488c -r 29ebc048d33f scripts/functions --- a/scripts/functions Tue Dec 09 22:02:20 2008 +0000 +++ b/scripts/functions Tue Dec 16 18:12:34 2008 +0000 @@ -617,8 +617,8 @@ if [ "${CT_OVERIDE_CONFIG_GUESS_SUB}" = "y" ]; then CT_DoLog ALL "Overiding config.guess and config.sub" for cfg in config_guess config_sub; do - eval ${cfg}="${CT_LIB_DIR}/tools/${cfg/_/.}" - [ -e "${CT_TOP_DIR}/tools/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/tools/${cfg/_/.}" + eval ${cfg}="${CT_LIB_DIR}/scripts/${cfg/_/.}" + [ -e "${CT_TOP_DIR}/scripts/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/scripts/${cfg/_/.}" # Can't use CT_DoExecLog because of the '{} \;' to be passed un-mangled to find find . -type f -name "${cfg/_/.}" -exec cp -v "${!cfg}" {} \; |CT_DoLog ALL done @@ -630,18 +630,18 @@ # Two wrappers to call config.(guess|sub) either from CT_TOP_DIR or CT_LIB_DIR. # Those from CT_TOP_DIR, if they exist, will be be more recent than those from CT_LIB_DIR. CT_DoConfigGuess() { - if [ -x "${CT_TOP_DIR}/tools/config.guess" ]; then - "${CT_TOP_DIR}/tools/config.guess" + if [ -x "${CT_TOP_DIR}/scripts/config.guess" ]; then + "${CT_TOP_DIR}/scripts/config.guess" else - "${CT_LIB_DIR}/tools/config.guess" + "${CT_LIB_DIR}/scripts/config.guess" fi } CT_DoConfigSub() { - if [ -x "${CT_TOP_DIR}/tools/config.sub" ]; then - "${CT_TOP_DIR}/tools/config.sub" "$@" + if [ -x "${CT_TOP_DIR}/scripts/config.sub" ]; then + "${CT_TOP_DIR}/scripts/config.sub" "$@" else - "${CT_LIB_DIR}/tools/config.sub" "$@" + "${CT_LIB_DIR}/scripts/config.sub" "$@" fi }