--- a/sbsv2/raptor/lib/config/gcc.xml	Thu Apr 29 11:10:13 2010 +0100
+++ b/sbsv2/raptor/lib/config/gcc.xml	Thu Apr 29 13:32:00 2010 +0100
@@ -74,7 +74,8 @@
 		<set name='BLDINF_OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
 
 		<set name='OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
-		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2$$(TOOLPLATFORMDIR)'/>
+		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2' host='win.*'/>
+		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2/$(HOSTPLATFORM_DIR)' host='lin.*'/>
 	</var>
 
 	<var name="t_deb">

--- a/sbsv2/raptor/test/smoke_suite/query_cli.py	Thu Apr 29 11:10:13 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/query_cli.py	Thu Apr 29 13:32:00 2010 +0100
@@ -14,11 +14,11 @@
 # Description: 
 #
 
-from raptor_tests import SmokeTest
+import raptor_tests
 
 def run():
 	
-	t = SmokeTest()
+	t = raptor_tests.SmokeTest()
 	t.description = "Test the --query command-line option"
 
 	t.name = "query_cli_alias"
@@ -78,10 +78,16 @@
 	
 	t.name = "query_cli_config_others"
 	t.command = "sbs --query=config[winscw_urel] --query=config[tools2_rel]"
+	
+	if t.onWindows:
+		t2 = "tools2"
+	else:
+		t2 = raptor_tests.ReplaceEnvs("tools2/$(HOSTPLATFORM_DIR)")
+		
 	t.mustmatch_singleline = [
 		"<sbs version='2.*'>",
 		"outputpath='.*/epoc32/release/winscw/urel'",
-		"outputpath='.*/epoc32/release/tools2/rel'",
+		"outputpath='.*/epoc32/release/%s/rel'" % t2,
 		"</sbs>"
 		]
 	t.mustnotmatch_singleline = []