# HG changeset patch
# User Dean Draper <dean.draper@nokia.com>
# Date 1274209454 -3600
# Node ID a50b8a8df628beae97b2cb0e80a316332f6d61d4
# Parent  245c03ee6e9cde743afb07864fa361b92a6ba5c4
Fix for SF Bug 2562[Raptor]adds incorrect entries into .iby files w.r.t file paths

diff -r 245c03ee6e9c -r a50b8a8df628 sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html	Mon May 17 18:33:53 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Tue May 18 20:04:14 2010 +0100
@@ -11,6 +11,7 @@
 <h3>Defect Fixes</h3>
 <ul>
 <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 245c03ee6e9c -r a50b8a8df628 sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Mon May 17 18:33:53 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue May 18 20:04:14 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 245c03ee6e9c -r a50b8a8df628 sbsv2/raptor/lib/flm/standard.xml
--- a/sbsv2/raptor/lib/flm/standard.xml	Mon May 17 18:33:53 2010 +0100
+++ b/sbsv2/raptor/lib/flm/standard.xml	Tue May 18 20:04:14 2010 +0100
@@ -40,6 +40,7 @@
 		<param name='SOURCE' default=''/>
 		<param name='TARGET'/>
 		<param name='TARGET_lower'/>
+		<param name='TARGETPATH'/>
 		<param name='LTCG' default=''/>
 		<param name='LTCG_OPTION' default='--ltcg'/>
 		<param name='TARGETTYPE'/>