# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1274280478 -3600
# Node ID 6656482ba0da2ccc25305f04dd20bd1e052fad91
# Parent  50c238674c4bd205efdf1e42b53be3c04b35b6b7# Parent  d4ab34a8c6dcf5a843856aaaee6e2391979332dc
Merge

diff -r d4ab34a8c6dc -r 6656482ba0da sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html	Tue May 18 22:28:22 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Wed May 19 15:47:58 2010 +0100
@@ -12,6 +12,7 @@
 <ul>
 <li>Fix : tracecompiler.mk caused poor makefile parse performance due to use of $(shell)</li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2561"> SF Bug 2561 </a> - [Raptor] creates incorrect .iby files w.r.t target file versions &amp; ramtargets</li>
+<li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2562"> SF Bug 2562 </a> - [Raptor] adds incorrect entries into .iby files w.r.t file paths</li>
 </ul>
 
 <h2>version 2.14.0</h2>
diff -r d4ab34a8c6dc -r 6656482ba0da sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue May 18 22:28:22 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Wed May 19 15:47:58 2010 +0100
@@ -1102,7 +1102,7 @@
         # Default values
         ROMFILETYPE:=file
         ROMFILE:=$(TARGET).$(REQUESTEDTARGETEXT)
-        ROMPATH:=sys/bin/
+        ROMPATH:=$(if $(TARGETPATH),$(TARGETPATH)/,sys/bin/)
         ROMDECORATIONS:=
         ROMFILETYPE_RAM:=data
         ROMFILE_RAM:=$(TARGET).$(REQUESTEDTARGETEXT)
diff -r d4ab34a8c6dc -r 6656482ba0da sbsv2/raptor/lib/flm/standard.xml
--- a/sbsv2/raptor/lib/flm/standard.xml	Tue May 18 22:28:22 2010 +0100
+++ b/sbsv2/raptor/lib/flm/standard.xml	Wed May 19 15:47:58 2010 +0100
@@ -40,6 +40,7 @@
 		<param name='SOURCE' default=''/>
 		<param name='TARGET'/>
 		<param name='TARGET_lower'/>
+		<param name='TARGETPATH' default=''/>
 		<param name='LTCG' default=''/>
 		<param name='LTCG_OPTION' default='--ltcg'/>
 		<param name='TARGETTYPE'/>