From ca692c93f71dd05a25e21191e69b8f2d07d92622 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 23 Jan 2009 11:17:00 -0600 Subject: Revert BASEDIR and dest changes These changes are potential breakers and we are not fully prepared to test them, nor are they fully usable just yet. Revert for now. Signed-off-by: Aaron Griffin --- functions | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 9c5f75b..1ce535c 100644 --- a/functions +++ b/functions @@ -172,6 +172,11 @@ add_binary () bin="${1}" fi + dest="" + if [ $# -eq 2 ]; then + dest=${2} + fi + if [ ! -f "${bin}" ]; then err "'${bin}' is not a file" return 1 @@ -182,7 +187,7 @@ add_binary () case "${type}" in *script*) msg " adding '${type}' script, ensure proper interp exists..." - add_file "${bin}" + add_file "${bin}" ${dest} ;; *executable*|*shared\ object*) add_file "${bin}" ${dest} @@ -193,7 +198,7 @@ add_binary () #remove TLS libraries notls=$(echo ${lib} | sed 's|/lib/tls.*/\(lib.*\)|/lib/\1|') [ -e "${notls}" ] && lib="${notls}" - [ -f "${lib}" ] && add_file "${BASEDIR}${lib}" + [ -f "${lib}" ] && add_file "${lib}" fi done ;; @@ -216,7 +221,7 @@ parse_hook () for bin in ${BINARIES}; do if [ -n "${bin}" ]; then - add_binary "${BASEDIR}${bin}" + add_binary "${bin}" fi done -- cgit v1.2.3-24-g4f1b