From 65bb3ac67c741c46aa27ccd98cb7930a2b731306 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 16 Dec 2008 18:12:34 +0000 Subject: Get rid of the tols/ directory: - move config.guess and config.sub from tools/ into scripts/ - update the scripts and makefile fragments accordingly /trunk/Makefile.in | 10 5 5 0 +++++----- /trunk/scripts/functions | 16 8 8 0 ++++++++-------- /trunk/scripts/scripts.mk | 28 13 15 0 +++++++++++++--------------- /trunk/ct-ng.in | 4 2 2 0 ++-- 4 files changed, 28 insertions(+), 30 deletions(-) --- scripts/functions | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/functions') diff --git a/scripts/functions b/scripts/functions index 6fbc9cf3..7c69c001 100644 --- a/scripts/functions +++ b/scripts/functions @@ -617,8 +617,8 @@ CT_ExtractAndPatch() { 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 @@ CT_ExtractAndPatch() { # 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 } -- cgit v1.2.3