targets and builds

1 files changed, 5 insertions, 5 deletions

diff --git a/remote/setup_tools b/remote/setup_tools
index b554f448..713d03fd 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -124,7 +124,7 @@ copyfileswithdependencies () {
 	pdebug "[stage32] File list generated at ${MODULE_BUILD_DIR}/${COPYFILES_LIST}."
 	if [ -s "$COPYFILES_LIST" ]; then
 		local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l)
-		pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory."
+		pinfo "Copying $CLISTCOUNT files to '${TARGET_BUILD_DIR}'."
 		tarcopy "$(cat "$COPYFILES_LIST"|sort -u)" "${TARGET_BUILD_DIR}"
 	fi
 }
@@ -137,10 +137,10 @@ generate_target() {
 		perror "Target directory cannot be named 'build' nor 'modules'."
 
 	# check for target directory
-	TARGET_DIR="${MODE_DIR}/${TARGET}"
+	TARGET_DIR="${MODE_DIR}/targets/${TARGET}"
 	[ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET"
 
-	TARGET_BUILD_DIR="${MODE_DIR}/build/${TARGET}"
+	TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}"
 
 	pinfo "Generating '$TARGET_BUILD_DIR' for '$TARGET'"
 
@@ -171,10 +171,10 @@ generate_target() {
 process_module() {
 	[ "$#" -ne "1" ] && perror "process_module: want 1 param."
 	local MODULE="$1"
-	local MODULE_DIR="${TARGET_DIR}/${MODULE}"
-	local MODULE_BUILD_DIR="${MODULE_DIR}/build"
 	[[ "$PROCESSED_MODULES" == *"!${MODULE}!"* ]] && return # Already processed this module
 	PROCESSED_MODULES="${PROCESSED_MODULES}!${MODULE}!"
+	local MODULE_DIR="${TARGET_DIR}/${MODULE}"
+	local MODULE_BUILD_DIR="${MODULE_DIR}/build"
 	local TOOL_STR=""
 	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $MODULE ]"
 	TOOL_STR="[${MODULE}]"