--- a/sf-package/package_props.ant.xml	Mon Jun 14 14:38:05 2010 +0100
+++ b/sf-package/package_props.ant.xml	Mon Jun 14 16:10:45 2010 +0100
@@ -9,7 +9,7 @@
   <property name="sf.spec.baseline.enable" value="true"/>
   <property name="sf.spec.baseline.select" value="location"/>
   <property name="sf.spec.baseline.location" value="\\v800020\Releases\PDK_2.0.e"/>
-  <property name="sf.spec.baseline.getenv_options" value="-i emu -i rnd -i tools -i info"/>
+  <property name="sf.spec.baseline.getenv_options" value="-i emu -i prebuilt -i rnd -i tools -i info"/>
   
   <property name="sf.spec.toolsbaseline.enable" value="false"/>
   

--- a/sf-platform/platform_props.ant.xml	Mon Jun 14 14:38:05 2010 +0100
+++ b/sf-platform/platform_props.ant.xml	Mon Jun 14 16:10:45 2010 +0100
@@ -7,13 +7,12 @@
 
   <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan -->
 
-  <property name="sf.spec.baseline.getenv_options" value="-I tools -k"/> <!-- Sync the tools... -->
+  <property name="sf.spec.baseline.getenv_options" value="-i prebuilt -k"/> <!-- unpack anything prebuilt from baseline -->
   <property name="sf.spec.baseline.clean"          value="false"/>
   <property name="sf.spec.baseline.select"         value="location" />
 
-  <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu -k"/>
+  <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k"/>
   <property name="sf.spec.toolsbaseline.select"         value="location" />
-  <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_b50" /> <!-- for TEF etc -->
   
   <property name="sf.spec.prebuilt.excludelist"     value="${sf.spec.job.dir}/../prebuilt_excludelist.txt"/>