# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1233528076 0
# Node ID 15908c920549466432dca9e7b930803e92de11b9
# Parent  5c20d52c82702ebd1eb0b5f74ff389fe766f46ea
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(-)

diff -r 5c20d52c8270 -r 15908c920549 scripts/functions
--- a/scripts/functions	Sun Feb 01 18:51:19 2009 +0000
+++ b/scripts/functions	Sun Feb 01 22:41:16 2009 +0000
@@ -905,9 +905,14 @@
 
     if [ "${CT_BARE_METAL}" != "y" ]; then
         CT_DoLog EXTRA "Installing the populate helper"
-        sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;'     \
-               -e 's|@@CT_bash@@|'"${bash}"'|g;'            \
-               "${CT_LIB_DIR}/scripts/populate.in"          \
+        sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
+               -e 's|@@CT_install@@|'"${install}"'|g;'  \
+               -e 's|@@CT_bash@@|'"${bash}"'|g;'        \
+               -e 's|@@CT_grep@@|'"${grep}"'|g;'        \
+               -e 's|@@CT_make@@|'"${make}"'|g;'        \
+               -e 's|@@CT_awk@@|'"${awk}"'|g;'          \
+               -e 's|@@CT_sed@@|'"${sed}"'|g;'          \
+               "${CT_LIB_DIR}/scripts/populate.in"      \
                >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
         CT_DoExecLog ALL chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
     fi
diff -r 5c20d52c8270 -r 15908c920549 scripts/populate.in
--- a/scripts/populate.in	Sun Feb 01 18:51:19 2009 +0000
+++ b/scripts/populate.in	Sun Feb 01 22:41:16 2009 +0000
@@ -13,8 +13,10 @@
 
 myname=$(basename "$0")
 
-# Parse the tools' paths configuration
-. "${CT_LIB_DIR}/paths.mk"
+# Use the tols discovered by crosstool-NG's ./configure:
+install="@@CT_install@@"
+grep="@@CT_grep@@"
+sed="@@CT_sed@@"
 
 doHelp() {
     cat <<_EOF_