--- a/buildframework/helium/tools/localisation/localiser/ECLocaliser.pm	Wed Oct 28 14:39:48 2009 +0000
+++ b/buildframework/helium/tools/localisation/localiser/ECLocaliser.pm	Wed Dec 23 19:29:07 2009 +0200
@@ -273,7 +273,7 @@
 
 		while (<RDRFH>)
 		{
-				if ( /^\s*<option (\w+)>/ )
+				if ( /^\s*<option ([A-Za-z0-9\.]+)>/ )				
 				{
 					my $option = lc($1);
 					$self->{ __platform }->{ $option } = $option; # if ($option =~ /^(armv5|winscw)$/i);
@@ -1484,7 +1484,9 @@
 				{
 					my $uf = $f;
 					$uf =~ s/\.(mmp|mk)$//i;
-					if ( $uf =~ m/$mmp$/i )
+					# Following reqular expression is changed to match with strings starting with a slash or backslash
+					# in order to prevent similarly ending but unidentical files to match with each other.
+					if ( $uf =~ m/[\/\\]$mmp$/i )
 					{
 						__OUT::Print ("  + Found '$mmp' match => '$f'\n");
 						$self->{__mmpstype}->{$mmp}->{path} = $f;
@@ -1810,7 +1812,7 @@
 		# if distination file exist then clear read flag
 		if (-f $dist)
 		{
-				chmod ($dist , 0755);
+				chmod (0755 , $dist);
 		}
 		else
 		{