From 430ce931e1f6a02fadc77a4e214a95d85bfaaf9e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 1 Feb 2009 17:11:46 +0000
Subject: [PATCH] Use tools discovered by ./configure in scripts/saveSample.sh

 /trunk/Makefile.in              |    7     6     1     0 ++++++-
 /trunk/scripts/saveSample.sh.in |   23    13    10     0 +++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)
---
 Makefile.in                                 |  7 ++++++-
 scripts/{saveSample.sh => saveSample.sh.in} | 23 ++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)
 rename scripts/{saveSample.sh => saveSample.sh.in} (77%)

diff --git a/Makefile.in b/Makefile.in
index eee57dae..c9e94a29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ uninstall: real-uninstall
 #--------------------------------------
 # Build rules
 
-build-bin: ct-ng scripts/crosstool-NG.sh
+build-bin: ct-ng scripts/crosstool-NG.sh scripts/saveSample.sh
 
 build-lib: paths.mk
 
@@ -150,6 +150,8 @@ clean-bin:
 	@rm -f ct-ng
 	@echo "  RM     'script/crosstool-NG.sh'"
 	@rm -f scripts/crosstool-NG.sh
+	@echo "  RM     'script/saveSample.sh'"
+	@rm -f scripts/saveSample.sh
 
 clean-lib:
 	@echo "  RM     'paths.mk'"
@@ -173,6 +175,8 @@ real-install:
 	@chmod a+x ct-ng
 	@echo "  CHMOD  'scripts/crosstool-NG.sh'"
 	@chmod a+x scripts/crosstool-NG.sh
+	@echo "  CHMOD  'scripts/saveSample.sh'"
+	@chmod a+x scripts/saveSample.sh
 
 real-uninstall:
 	@true
@@ -201,6 +205,7 @@ install-lib-main: $(DESTDIR)$(LIBDIR)
 	     |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -);                     \
 	 done
 	@chmod a+x $(DESTDIR)$(LIBDIR)/scripts/crosstool-NG.sh
+	@chmod a+x $(DESTDIR)$(LIBDIR)/scripts/saveSample.sh
 	@rm -f "$(DESTDIR)$(LIBDIR)/scripts/addToolVersion.sh"
 	@echo "  INST   'steps.mk'"
 	@$(install) -m 644 steps.mk "$(DESTDIR)$(LIBDIR)/steps.mk"
diff --git a/scripts/saveSample.sh b/scripts/saveSample.sh.in
similarity index 77%
rename from scripts/saveSample.sh
rename to scripts/saveSample.sh.in
index 5e20e4f4..fe563115 100755
--- a/scripts/saveSample.sh
+++ b/scripts/saveSample.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@@CT_bash@@
 
 # This script is responsible for saving the current configuration into a
 # sample to be used later on as a pre-configured target.
@@ -8,6 +8,9 @@
 #  - the uClibc .config file if uClibc selected
 #  - info about who reported the sample
 
+# Parse the tools' paths configuration
+. "${CT_LIB_DIR}/paths.mk"
+
 # We'll need the stdout later, save it
 exec 7>&1
 
@@ -46,11 +49,11 @@ if [ ! -d "samples/${CT_TARGET}" ]; then
 fi
 
 # Save the crosstool-NG config file
-sed -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;'       \
-       -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;'              \
-       -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;'  \
-       -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;'                \
-    <.config                                                                \
+"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;'      \
+            -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;'             \
+            -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \
+            -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;'               \
+         <.config                                                               \
     >"samples/${CT_TARGET}/crosstool.config"
 
 # Function to copy a file to the sample directory
@@ -59,8 +62,8 @@ sed -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;'       \
 CT_DoAddFileToSample() {
     source="$1"
     dest="$2"
-    inode_s=$(ls -i "${source}" |gawk '{ print $1; }')
-    inode_d=$(ls -i "${dest}" 2>/dev/null |gawk '{ print $1; }' || true)
+    inode_s=$(ls -i "${source}" |"${awk}" '{ print $1; }')
+    inode_d=$(ls -i "${dest}" 2>/dev/null |"${awk}" '{ print $1; }' || true)
     if [ "${inode_s}" != "${inode_d}" ]; then
         cp "${source}" "${dest}"
     fi
@@ -76,8 +79,8 @@ fi
 if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
     # We save the file, and then point the saved sample to this file
     CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
-    sed -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE=).+$|\1"'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
-        "samples/${CT_TARGET}/crosstool.config"
+    "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE=).+$|\1"'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
+             "samples/${CT_TARGET}/crosstool.config"
 else
     # remove any dangling files
     for f in "samples/${CT_TARGET}/${CT_LIBC}-"*.config; do