Fix populate to correctly use tools discovered via ./configure.
/trunk/scripts/functions | 11 8 3 0 ++++++++---
/trunk/scripts/populate.in | 6 4 2 0 ++++--
2 files changed, 12 insertions(+), 5 deletions(-)
1.1 --- a/scripts/functions Sun Feb 01 18:51:19 2009 +0000
1.2 +++ b/scripts/functions Sun Feb 01 22:41:16 2009 +0000
1.3 @@ -905,9 +905,14 @@
1.4
1.5 if [ "${CT_BARE_METAL}" != "y" ]; then
1.6 CT_DoLog EXTRA "Installing the populate helper"
1.7 - sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
1.8 - -e 's|@@CT_bash@@|'"${bash}"'|g;' \
1.9 - "${CT_LIB_DIR}/scripts/populate.in" \
1.10 + sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
1.11 + -e 's|@@CT_install@@|'"${install}"'|g;' \
1.12 + -e 's|@@CT_bash@@|'"${bash}"'|g;' \
1.13 + -e 's|@@CT_grep@@|'"${grep}"'|g;' \
1.14 + -e 's|@@CT_make@@|'"${make}"'|g;' \
1.15 + -e 's|@@CT_awk@@|'"${awk}"'|g;' \
1.16 + -e 's|@@CT_sed@@|'"${sed}"'|g;' \
1.17 + "${CT_LIB_DIR}/scripts/populate.in" \
1.18 >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
1.19 CT_DoExecLog ALL chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
1.20 fi
2.1 --- a/scripts/populate.in Sun Feb 01 18:51:19 2009 +0000
2.2 +++ b/scripts/populate.in Sun Feb 01 22:41:16 2009 +0000
2.3 @@ -13,8 +13,10 @@
2.4
2.5 myname=$(basename "$0")
2.6
2.7 -# Parse the tools' paths configuration
2.8 -. "${CT_LIB_DIR}/paths.mk"
2.9 +# Use the tols discovered by crosstool-NG's ./configure:
2.10 +install="@@CT_install@@"
2.11 +grep="@@CT_grep@@"
2.12 +sed="@@CT_sed@@"
2.13
2.14 doHelp() {
2.15 cat <<_EOF_