diff -Naur gnupoc-package-1.13.orig/sdks/gnupoc-s60_50_rvct-patch gnupoc-package-1.13/sdks/gnupoc-s60_50_rvct-patch
--- gnupoc-package-1.13.orig/sdks/gnupoc-s60_50_rvct-patch	1969-12-31 19:00:00.000000000 -0500
+++ gnupoc-package-1.13/sdks/gnupoc-s60_50_rvct-patch	2009-09-17 15:58:31.000000000 -0400
@@ -0,0 +1,762 @@
+diff -Naur cl_arm.pm cl_arm.pm
+--- cl_arm.pm	2009-09-04 13:39:17.000000000 -0400
++++ cl_arm.pm	2009-09-04 14:05:54.000000000 -0400
+@@ -4,7 +4,7 @@
+ #
+ 
+ 
+-package Cl_arm;
++package cl_arm;
+ 
+ my $ToolPrefix='';
+ my %PlatOpt=(
+@@ -60,10 +60,10 @@
+ );
+ 
+ use Cwd;
+-use Armutl;
++use armutl;
+ use cl_generic;
+-use E32env;
+-use Genutl;
++use e32env;
++use genutl;
+ 
+ use constant NOCOMPRESSIONMETHOD => 0;
+ use constant INFLATECOMPRESSIONMETHOD => 1;
+@@ -365,7 +365,7 @@
+ 	my $DefFile=&main::DefFile;
+ 	my $EPOCPath=&main::EPOCPath;
+ 	my $LinkAs=&main::LinkAs;
+-	my $LibPath=&main::LibPath.'LIB\\';
++	my $LibPath=&main::LibPath.'lib/';
+ 	my @MacroList=&main::MacroList();
+ 	push @MacroList, "__SUPPORT_CPP_EXCEPTIONS__";
+ 
+@@ -471,8 +471,7 @@
+ 		&main::Output(
+ 			"\n",
+ 			"# must set both PATH and Path to make it work correctly\n",
+-			"Path:=",&main::Path_Drive,$EPOCPath,"gcc\\bin;\$(Path)\n",
+-			"PATH:=\$(Path)\n",
++			"PATH:=",&main::Path_Drive,$EPOCPath,"gcc/bin:\$(PATH)\n",
+ 			"\n"
+ 		);
+ 	}
+@@ -629,7 +628,7 @@
+ 		if ($BasicTrgType !~ /IMPLIB/io) {
+ 			&main::Output (
+ 				" \\\n\t",
+-				&Generic_Quote("\$(EPOCTRG$_)\\".&main::Trg($_))
++				&Generic_Quote("\$(EPOCTRG$_)/".&main::Trg($_))
+ 			);
+ 		}
+ 
+@@ -664,12 +663,12 @@
+ 		unless (&main::ExportUnfrozen) {
+ 			if (-e $DefFile) { # effectively "if project frozen ..."
+ 				&main::Output(
+-					" ", &Generic_Quote("\$(EPOCLIB)\\LIB\\$PrimaryExportLibrary.lib"),
++					" ", &Generic_Quote("\$(EPOCLIB)/lib/$PrimaryExportLibrary.lib"),
+ 				);
+ 				# if elf2e32.exe(postlinker) exists, then generate .dso along with .lib
+ 				if ($IsExistELF2E32EXE) {
+ 					&main::Output(
+-						" ", &Generic_Quote("\$(EPOCLIB)\\LIB\\$PrimaryExportLibrary.dso"), "\n"
++						" ", &Generic_Quote("\$(EPOCLIB)/lib/$PrimaryExportLibrary.dso"), "\n"
+ 					);
+ 				}
+ 				else {
+@@ -686,7 +685,7 @@
+ 		} else {
+ 			&main::Output(
+ 				"\n",
+-				"\t\@echo Not attempting to create \"\$(EPOCLIB)\\LIB\\$PrimaryExportLibrary.lib\"\n",
++				"\t\@echo Not attempting to create \"\$(EPOCLIB)/lib/$PrimaryExportLibrary.lib\"\n",
+ 				"\t\@echo from frozen .DEF file, since EXPORTUNFROZEN specified.\n"
+ 			);
+ 		}
+@@ -698,18 +697,18 @@
+ 			"\n",
+ 			"# REAL TARGET - LIBRARY\n",
+ 			"\n",
+-			&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExportLibrary.lib"), " : ",
++			&Generic_Quote("\$(EPOCLIB)/lib/$ExportLibrary.lib"), " : ",
+ 			&Generic_Quote($DefFile), "\n",
+-				"\tperl -S prepdef.pl ", &Generic_Quote($DefFile), " \"\$(EPOCBLD)\\$ExportLibrary.prep.def\"\n",
+-				"\tdef2dll.bat --path=\$(EPOCLIB)\\LIB \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--import=$ExportLibrary \\\n",
+-			"\t\t--deffile=\"\$(EPOCBLD)\\$ExportLibrary.prep.def\" \\\n\t\t--linkAs=$LinkAs \\\n\t\t$InterWorking\n",
++				"\tperl -S prepdef.pl ", &Generic_Quote($DefFile), " \"\$(EPOCBLD)/$ExportLibrary.prep.def\"\n",
++				"\tdef2dll --path=\$(EPOCLIB)/lib \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--import=$ExportLibrary \\\n",
++			"\t\t--deffile=\"\$(EPOCBLD)/$ExportLibrary.prep.def\" \\\n\t\t--linkAs=$LinkAs \\\n\t\t$InterWorking\n",
+ 			"\n",
+ 		 );
+ 		if ($ExtraExportLibrary) {
+ 			&main::Output(
+ 				"\n",
+-				&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExtraExportLibrary.lib"), " : ",
+-				&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExportLibrary.lib"), "\n",
++				&Generic_Quote("\$(EPOCLIB)/lib/$ExtraExportLibrary.lib"), " : ",
++				&Generic_Quote("\$(EPOCLIB)/lib/$ExportLibrary.lib"), "\n",
+ 				"\tcopy \"\$<\" \"\$@\"\n"
+ 			);
+ 		}
+@@ -717,17 +716,17 @@
+ 		if ($IsExistELF2E32EXE) {
+ 			&main::Output(
+ 				"\n",
+-				&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExportLibrary.dso"), " : ",
++				&Generic_Quote("\$(EPOCLIB)/lib/$ExportLibrary.dso"), " : ",
+ 				&Generic_Quote($DefFile), "\n",
+-					"\telf2e32 --definput=\"\$(EPOCBLD)\\$ExportLibrary.prep.def\" --dso=",
++					"\telf2e32 --definput=\"\$(EPOCBLD)/$ExportLibrary.prep.def\" --dso=",
+-					&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExportLibrary.dso"),
++					&Generic_Quote("\$(EPOCLIB)/lib/$ExportLibrary.dso"),
+ 					" --linkas=$LinkAs\n"
+ 			);
+ 			if ($ExtraExportLibrary) {
+ 				&main::Output(
+ 					"\n",
+-					&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExtraExportLibrary.dso"), " : ",
+-					&Generic_Quote("\$(EPOCLIB)\\LIB\\$ExportLibrary.dso"), "\n",
++					&Generic_Quote("\$(EPOCLIB)/lib/$ExtraExportLibrary.dso"), " : ",
++					&Generic_Quote("\$(EPOCLIB)/lib/$ExportLibrary.dso"), "\n",
+ 					"\tcopy \"\$<\" \"\$@\"\n"
+ 				);
+ 			}		
+@@ -765,7 +764,7 @@
+ 	if ($DefFile and $BasicTrgType!~/^IMPLIB$/io) {
+ # 	    call perl on the script here so make will die if there are errors 
+ #           - this doesn't happen if calling perl in a batch file
+-	    &main::Output( "\tperl -S efreeze.pl \$(EFREEZE_ALLOW_REMOVE) \"$DefFile\" \"\$(EPOCBLD)\\$ExportLibrary.def\" \n" );
++	    &main::Output( "\tperl -S efreeze.pl \$(EFREEZE_ALLOW_REMOVE) \"$DefFile\" \"\$(EPOCBLD)/$ExportLibrary.def\" \n" );
+ 	}
+ 	&main::Output(
+ 		"\n",
+@@ -773,11 +772,11 @@
+ 	);
+ 	if ($DefFile and !$NoExportLibrary) {
+ 		&main::Output(
+-			"\t-\$(ERASE) \"\$(EPOCLIB)\\LIB\\$ExportLibrary.lib\"\n"
++			"\t-\$(ERASE) \"\$(EPOCLIB)/lib/$ExportLibrary.lib\"\n"
+ 		);
+ 		if ($ExtraExportLibrary) {
+ 			&main::Output(
+-				"\t-\$(ERASE) \"\$(EPOCLIB)\\LIB\\$ExtraExportLibrary.lib\"\n"
++				"\t-\$(ERASE) \"\$(EPOCLIB)/lib/$ExtraExportLibrary.lib\"\n"
+ 			);
+ 		}
+ 	}
+@@ -1013,33 +1012,33 @@
+ 			# Temporary Workaround for RVCT2.1 static libs problem with RVCT2.2 builds
+ 			&main::Output(
+ 				" \\\n\t",
+-				&Generic_Quote("\$(EPOCSTATLINK$Bld)\\EDLLSTUB$RVCTVersion.lib")
++				&Generic_Quote("\$(EPOCSTATLINK$Bld)/edllstub$RVCTVersion.lib")
+ 			);
+ 		}
+ 		else {
+ 			&main::Output(
+ 				" \\\n\t",
+-				&Generic_Quote("\$(EPOCSTATLINK$Bld)\\EDLLSTUB.lib")
++				&Generic_Quote("\$(EPOCSTATLINK$Bld)/edllstub.lib")
+ 			);
+ 		}
+ 	}
+ 	    
+-        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList);
+-        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)\\\\LIB\\\\\$_\"\)", @LibList);
++        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCSTATLINK$Bld\)/\$_\"\)", @StatLibList);
++        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)/lib/\$_\"\)", @LibList);
+ 
+ 		#OE Import Libraries 
+ 		if ( $TrgType=~/^STDEXE$/o || $TrgType=~/^STDDLL$/o ) 
+ 		{
+-			PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)\\\\LIB\\\\\$_\"\)", @oe_import_library_list);
++			PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)/lib/\$_\"\)", @oe_import_library_list);
+ 		}
+ 
+ 		#OE Glue Code
+ 		if ($TrgType=~/^STDEXE$/o) {
+ 			if (&main::IsWideCharMain()) {
+-				PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)\\\\$Bld\\\\\$_\"\)", @oe_exe_libs_wchar);
++				PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)/$Bld/\$_\"\)", @oe_exe_libs_wchar);
+ 			}
+ 			else {
+-				PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)\\\\$Bld\\\\\$_\"\)", @oe_exe_libs);
++				PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)/$Bld/\$_\"\)", @oe_exe_libs);
+ 			}
+ 		}
+ 
+@@ -1048,7 +1047,7 @@
+         $StaticRTLib = "ksrt${RVCTVersion}" if ($SystemTrg);
+         &main::Output(
+ 	        " \\\n\t",
+-		&Generic_Quote("\$(EPOCSTATLINK$Bld)\\$StaticRTLib\.lib")
++		&Generic_Quote("\$(EPOCSTATLINK$Bld)/$StaticRTLib\.lib")
+ 		) unless ($Trg =~ /(U|K)SRT/i || ($BasicTrgType=~/^LIB$/o));
+ 
+ 	unless ($ArmRT || ($BasicTrgType=~/^LIB$/o)) {
+@@ -1058,7 +1057,7 @@
+ 			foreach (@RTLibList) {
+ 				&main::Output(
+ 					" \\\n\t",
+-					&Generic_Quote("\$(EPOCLIB)\\LIB\\$_")
++					&Generic_Quote("\$(EPOCLIB)/lib/$_")
+ 				) unless ($_ =~ /$TargLib/i);
+ 			}
+ 	    }
+@@ -1079,8 +1078,7 @@
+ 	&main::Output(
+ 		"VTBLEXPORTS$Bld="
+ 	);
+-        my $vtobj = quotemeta("(VtblExports.o)");
+-        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)\\\\LIB\\\\\$_$vtobj\"\)", @LibList);
++        PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCLIB\)/lib/\$_\\\\(VtblExports.o\\\\)\"\)", @LibList);
+ 	&main::Output(
+ 		"\n",
+ 		"\n"
+@@ -1114,7 +1112,7 @@
+ 
+ 	        &main::Output(
+ 		        " \\\n\t",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.o")
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.o")
+ 		      );
+ 
+ #	Only add if not already added from @StringTables
+@@ -1140,13 +1138,13 @@
+ 
+         if ($BasicTrgType=~/^LIB$/o) {
+ 	        &main::Output(
+-		      &Generic_Quote("\$(EPOCTRG$Bld)\\$Trg"),
++		      &Generic_Quote("\$(EPOCTRG$Bld)/$Trg"),
+ 		      " : \$(OBJECTS$Bld)"
+ 		);
+         } else {
+ 	        &main::Output(
+-		      &Generic_Quote("\$(EPOCTRG$Bld)\\$Trg"), " : ",
+-		      &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseTrg.in")
++		      &Generic_Quote("\$(EPOCTRG$Bld)/$Trg"), " : ",
++		      &Generic_Quote("\$(EPOCBLD$Bld)/$BaseTrg.in")
+ 	        );
+         }
+ 
+@@ -1157,7 +1155,7 @@
+ 	}
+ 	if ($BasicTrgType=~/^(EXE|DLL)$/o) {
+ 		&main::Output(
+-			" ", &Generic_Quote("\$(EPOCSTATLINK$Bld)\\$FirstLib")
++			" ", &Generic_Quote("\$(EPOCSTATLINK$Bld)/$FirstLib")
+ 		);
+ 	}
+ 	&main::Output(
+@@ -1167,23 +1165,23 @@
+ #	generate an export object from the ordered .DEF file
+         if ($BasicTrgType=~/^DLL$/o || $TrgType=~/^EXEXP$/o || $TrgType=~/^EXEDLL$/o) {
+ #       	make the .exp file a dependency for targets that have exports		
+-		&main::Output(" ", &Generic_Quote("\$(EPOCBLD$Bld)\\$ExportLibrary.exp"), "\n");
++		&main::Output(" ", &Generic_Quote("\$(EPOCBLD$Bld)/$ExportLibrary.exp"), "\n");
+ 		if (&main::ExportUnfrozen) {
+ 		    &main::Output(
+-			"\tdef2dll.bat --path=\$(EPOCBLD$Bld) \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--export=$ExportLibrary \\\n\t\t--import=$ExportLibrary\\\n",
+-			"\t\t--deffile=\$(EPOCBLD$Bld)\\$ExportLibrary.def \\\n\t\t--linkAs=$LinkAs \\\n\t\t$InterWorking $symNameLkupOpt\n",
++			"\tdef2dll --path=\$(EPOCBLD$Bld) \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--export=$ExportLibrary \\\n\t\t--import=$ExportLibrary\\\n",
++			"\t\t--deffile=\$(EPOCBLD$Bld)/$ExportLibrary.def \\\n\t\t--linkAs=$LinkAs \\\n\t\t$InterWorking $symNameLkupOpt\n",
+ 		    );
+ 		    &main::Output(
+ 		        "\n",
+-		        "\tcopy ", " \"\$(EPOCBLD$Bld)\\$ExportLibrary.lib\" ",
+-		        "\"\$(EPOCLIB)\\LIB\\$ExportLibrary.lib\"",
++		        "\tcopy ", " \"\$(EPOCBLD$Bld)/$ExportLibrary.lib\" ",
++		        "\"\$(EPOCLIB)/lib/$ExportLibrary.lib\"",
+ 		        "\n"
+ 		    );
+ 		    if ($ExtraExportLibrary) {
+ 			&main::Output(
+ 			    "\n",
+-			    "\tcopy \"\$(EPOCLIB)\\LIB\\$ExportLibrary.lib\" ",
+-			    "\"\$(EPOCLIB)\\LIB\\$ExtraExportLibrary.lib\"",
++			    "\tcopy \"\$(EPOCLIB)/lib/$ExportLibrary.lib\" ",
++			    "\"\$(EPOCLIB)/lib/$ExtraExportLibrary.lib\"",
+ 			    "\n"
+ 			);
+ 		    }			    
+@@ -1191,14 +1189,14 @@
+ 		    if ($IsExistELF2E32EXE) {
+ 			    &main::Output(
+ 				    "\n",
+-				    "\telf2e32 --definput=\"\$(EPOCBLD$Bld)\\$ExportLibrary.def\" --dso=",
+-				    "\$(EPOCLIB)\\LIB\\$ExportLibrary.dso --linkas=$LinkAs\n"
++				    "\telf2e32 --definput=\"\$(EPOCBLD$Bld)/$ExportLibrary.def\" --dso=",
++				    "\$(EPOCLIB)/lib/$ExportLibrary.dso --linkas=$LinkAs\n"
+ 			    );
+ 			    if ($ExtraExportLibrary) {
+ 				    &main::Output(
+ 					    "\n",
+-					    "\tcopy \"\$(EPOCLIB)\\LIB\\$ExportLibrary.dso\" ",
+-					    "\"\$(EPOCLIB)\\LIB\\$ExtraExportLibrary.dso\"",
++					    "\tcopy \"\$(EPOCLIB)/lib/$ExportLibrary.dso\" ",
++					    "\"\$(EPOCLIB)/lib/$ExtraExportLibrary.dso\"",
+ 					    "\n"
+ 				    );
+ 			    }		
+@@ -1206,7 +1204,7 @@
+ 	        }
+ 	} elsif($NamedSymLkup){
+ #		For an EXE, generate the .exp to accomodate 0th ordinal
+-		&main::Output(" ", &Generic_Quote("\$(EPOCBLD$Bld)\\$ExportLibrary.exp"), "\n");
++		&main::Output(" ", &Generic_Quote("\$(EPOCBLD$Bld)/$ExportLibrary.exp"), "\n");
+ 	}
+ 	else {
+ 	    &main::Output("\n");
+@@ -1215,7 +1213,7 @@
+ #       get rid of any -symbols produced .map file
+         if ($BasicTrgType=~/^(DLL|EXE)/o) {
+ 	        &main::Output(
+-			"\t-\$(ERASE) \"\$(EPOCTRG$Bld)\\$Trg.map\" \n"
++			"\t-\$(ERASE) \"\$(EPOCTRG$Bld)/$Trg.map\" \n"
+ 		);	
+ 	}
+ #		Generate the dependency info - This is required to put the libraries in the same order
+@@ -1224,7 +1222,7 @@
+ 			&main::Output(
+ 			"\tperl -S deputil.pl $InterWorking --path=\$(EPOCBLD$Bld) \\\n",
+ 			 "\t\t--out=$ExportLibrary \\\n",
+-			 "\t\t--libpath=\$(EPOCLIB)\\LIB \\\n",
++			 "\t\t--libpath=\$(EPOCLIB)/lib \\\n",
+ 			 "\t\t\$(LIBS$Bld)\n",
+ 			);
+ 		}
+@@ -1270,8 +1268,8 @@
+ 		            $ObjFile = "V_ENTRY_.o";
+ 	            }
+ 	            &main::Output(
+-				    "\t\t${oP}entry _E32Dll \$(EPOCSTATLINK$Bld)\\$FirstLib($ObjFile) \\\n",
+-				    "\t\t\$(EPOCBLD$Bld)\\$ExportLibrary.exp \\\n"
++				    "\t\t${oP}entry _E32Dll \$(EPOCSTATLINK$Bld)/$FirstLib\\($ObjFile\\) \\\n",
++				    "\t\t\$(EPOCBLD$Bld)/$ExportLibrary.exp \\\n"
+ 				);
+ 	        } elsif ($BasicTrgType=~/^EXE$/o || $TrgType=~/^EXEXP$/o) {
+ 			    # get the right object file for the entry point
+@@ -1286,36 +1284,36 @@
+ 					} 
+ 				} 
+ 			    
+-			    &main::Output( "\t\t${oP}entry _E32Startup \$(EPOCSTATLINK$Bld)\\$FirstLib($ObjFile) \\\n" );
++			    &main::Output( "\t\t${oP}entry _E32Startup \$(EPOCSTATLINK$Bld)/$FirstLib\\($ObjFile\\) \\\n" );
+ 			    if ($TrgType=~/^EXEXP$/o || $TrgType=~/^EXEDLL$/o || $NamedSymLkup) {
+-					&main::Output( "\t\t\$(EPOCBLD$Bld)\\$ExportLibrary.exp \\\n" );
++					&main::Output( "\t\t\$(EPOCBLD$Bld)/$ExportLibrary.exp \\\n" );
+ 			    }
+ 			}
+ 			if($NamedSymLkup) {
+ 				&main::Output(
+-				"\t\t--edit \"\$(EPOCBLD$Bld)\\$ExportLibrary.dep\" \\\n"
++				"\t\t--edit \"\$(EPOCBLD$Bld)/$ExportLibrary.dep\" \\\n"
+ 				);
+ 			}
+ 	        &main::Output(
+-		        "\t\t-o \"\$(EPOCBLD$Bld)\\$Trg\" \\\n",
+-		        "\t\t${oP}symbols ${oP}list \"\$(EPOCTRG$Bld)\\$Trg.map\" \\\n",
+-				"\t\t\$(EPOCBLD$Bld)\\$BaseTrg.in \\\n"
++		        "\t\t-o \"\$(EPOCBLD$Bld)/$Trg\" \\\n",
++		        "\t\t${oP}symbols ${oP}list \"\$(EPOCTRG$Bld)/$Trg.map\" \\\n",
++				"\t\t\$(EPOCBLD$Bld)/$BaseTrg.in \\\n"
+ 			);
+ 	        &main::Output(
+-		        "\t\t\$(LIBS$Bld) \\\n",
++		        "\t\t\$(addsuffix ',\$(addprefix ',\$(LIBS$Bld))) \\\n",
+ 				"\t\t\$(VTBLEXPORTS$Bld) \$(USERLDFLAGS) \n"
+ 			);
+ 
+ 	        if(&main::DebugSwitchUsed() ){
+ 				if(&main::SymbolicDebugEnabled() ) {
+ 				&main::Output(
+-					"\tcopy \"\$(EPOCBLD$Bld)\\$Trg\" \"\$(EPOCTRG$Bld)\\$FeatureVariantBaseTrg.sym\"\n"
++					"\tcopy \"\$(EPOCBLD$Bld)/$Trg\" \"\$(EPOCTRG$Bld)/$FeatureVariantBaseTrg.sym\"\n"
+ 					);
+ 				}
+ 			}
+ 	        elsif ($Bld=~/^UDEB$/o) {
+ 	               &main::Output(
+-			       "\tcopy \"\$(EPOCBLD$Bld)\\$Trg\" \"\$(EPOCTRG$Bld)\\$FeatureVariantBaseTrg.sym\"\n"
++			       "\tcopy \"\$(EPOCBLD$Bld)/$Trg\" \"\$(EPOCTRG$Bld)/$FeatureVariantBaseTrg.sym\"\n"
+ 		       );
+ 	        }
+ 		
+@@ -1440,7 +1438,7 @@
+ 			"\\\n\t\t"
+ 		);
+ 		&main::Output(
+-			" \"\$(EPOCBLD$Bld)\\$Trg\""
++			" \"\$(EPOCBLD$Bld)/$Trg\""
+ 		);
+ 		&main::Output(
+ 			"\\\n\t\t"
+@@ -1455,7 +1453,7 @@
+          }
+          elsif ($BasicTrgType=~/^LIB$/o) {
+ 	        &main::Output(
+-		        "\tarmar ${oP}create \$(EPOCSTATLINK$Bld)\\$Trg ${oP}via $objectsViaFile\n"
++		        "\tarmar ${oP}create \$(EPOCSTATLINK$Bld)/$Trg ${oP}via $objectsViaFile\n"
+ 		);
+          }
+ 
+@@ -1467,7 +1465,7 @@
+     #------------
+ 	 
+     &main::Output(
+-		&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseTrg.in"), ": \$(OBJECTS$Bld)\n",
++		&Generic_Quote("\$(EPOCBLD$Bld)/$BaseTrg.in"), ": \$(OBJECTS$Bld)\n",
+  	    "\t$Link $linkerDebugOpt ${oP}partial \\\n",
+ 	    "\t\t-o \$\@ \\\n",
+ 	    "\t\t${oP}via $objectsViaFile\n\n",
+@@ -1480,7 +1478,7 @@
+ 	    # TARGET *.EXP
+ 	    #------------
+ 	    &main::Output(
+-		    &Generic_Quote("\$(EPOCBLD$Bld)\\$ExportLibrary.exp"), ": \$(EPOCBLD$Bld)\\$BaseTrg.in"
++		    &Generic_Quote("\$(EPOCBLD$Bld)/$ExportLibrary.exp"), ": \$(EPOCBLD$Bld)/$BaseTrg.in"
+ 	    );
+ 
+ # if project is frozen, makedef (and hence the .exp file) are dependent upon it
+@@ -1491,9 +1489,9 @@
+ 		}
+ 
+ 	    &main::Output(
+-		"\n\tperl -S elf2inf.pl -o \$(EPOCBLD$Bld)\\$ExportLibrary.inf \\\n", 
++		"\n\tperl -S elf2inf.pl -o \$(EPOCBLD$Bld)/$ExportLibrary.inf \\\n", 
+ 		"\t\t\$\<",
+-		"\n\tperl -S makedef.pl $AbsentSubst -Inf \$(EPOCBLD$Bld)\\$ExportLibrary.inf \\\n"
++		"\n\tperl -S makedef.pl $AbsentSubst -Inf \$(EPOCBLD$Bld)/$ExportLibrary.inf \\\n"
+ 	    );
+     	if (!$DefFile || $NoExportLibrary) {    			
+     		&main::Output( "\t\t-ignore_unfrozen_noncallable \\\n" );
+@@ -1523,12 +1521,12 @@
+ 		    $Num++;
+ 	    }
+ 	    
+-	    my $theDefFile = "\$(EPOCBLD$Bld)\\$ExportLibrary.def";
++	    my $theDefFile = "\$(EPOCBLD$Bld)/$ExportLibrary.def";
+ 	    $theDefFile = $DefFile if (-e $DefFile && !&main::ExportUnfrozen);
+ 	    &main::Output(
+-		"\t\t\"\$(EPOCBLD$Bld)\\$ExportLibrary.def\"\n",
+-		"\tcopy \"\$(EPOCBLD$Bld)\\$ExportLibrary.def\" \"\$(EPOCBLD)\\$ExportLibrary.def\"\n",
+-		"\tdef2dll.bat $AbsentSubst \\\n\t\t--path=\$(EPOCBLD$Bld) \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--export=$ExportLibrary \\\n",
++		"\t\t\"\$(EPOCBLD$Bld)/$ExportLibrary.def\"\n",
++		"\tcopy \"\$(EPOCBLD$Bld)/$ExportLibrary.def\" \"\$(EPOCBLD)/$ExportLibrary.def\"\n",
++		"\tdef2dll $AbsentSubst \\\n\t\t--path=\$(EPOCBLD$Bld) \\\n\t\t--bldpath=\$(EPOCBLD) \\\n\t\t--export=$ExportLibrary \\\n",
+ 		"\t\t--deffile=$theDefFile \\\n\t\t--linkAs=$LinkAs \\\n\t\t$InterWorking $symNameLkupOpt\n"
+ 	    );
+     }
+@@ -1657,12 +1655,12 @@
+ 
+ 	foreach (@BldList) {
+ 		&main::Output(
+-			&Generic_Quote("\$(EPOCBLD$_)\\$BaseSrc.pre"), " ",
+-			&Generic_Quote("\$(EPOCBLD$_)\\$BaseObj.cpp"), " ",
++			&Generic_Quote("\$(EPOCBLD$_)/$BaseSrc.pre"), " ",
++			&Generic_Quote("\$(EPOCBLD$_)/$BaseObj.cpp"), " ",
+ 		) if $cia;
+ 		&main::Output(
+-			&Generic_Quote("\$(EPOCBLD$_)\\$BaseSrc.lis"), " ",
+-			&Generic_Quote("\$(EPOCBLD$_)\\$BaseObj.o"), " \\\n",
++			&Generic_Quote("\$(EPOCBLD$_)/$BaseSrc.lis"), " ",
++			&Generic_Quote("\$(EPOCBLD$_)/$BaseObj.o"), " \\\n",
+ 		);
+ 	}
+ 	&main::Output(
+@@ -1691,12 +1689,12 @@
+ 	}
+ 
+ 	&main::Output(
+-		&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.pre"), " ",
+-		&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseObj.cpp"), " ",
++		&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.pre"), " ",
++		&Generic_Quote("\$(EPOCBLD$Bld)/$BaseObj.cpp"), " ",
+ 	) if $cia;
+ 	&main::Output(
+-		&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), " ",
+-		&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseObj.o"), " :",
++		&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), " ",
++		&Generic_Quote("\$(EPOCBLD$Bld)/$BaseObj.o"), " :",
+ 	);
+         PrintList("\' \\\n\t\'\.\&Generic_Quote\(\$_\)", @DepList);
+ 	&main::Output(
+@@ -1723,12 +1721,12 @@
+ { 
+     my $IncPath = &main::EPOCIncPath;
+     
+-    return quoted_path(&Generic_Quote("$IncPath"."RVCT${RVCTVersion}\\RVCT${RVCTVersion}.H"));
++    return quoted_path(&Generic_Quote("$IncPath"."rvct${RVCTVersion}/rvct${RVCTVersion}.h"));
+ }
+ 
+ 
+-my $preinclude =   "--preinclude \$(EPOCINC)\\RVCT${RVCTVersion}\\RVCT${RVCTVersion}.h";
+-my $edg_preinclude = "-I \$(EPOCINC)\\RVCT${RVCTVersion} --preinclude edg_rvct${RVCTVersion}.h";
++my $preinclude =   "--preinclude \$(EPOCINC)/rvct${RVCTVersion}/rvct${RVCTVersion}.h";
++my $edg_preinclude = "-I \$(EPOCINC)/rvct${RVCTVersion} --preinclude edg_rvct${RVCTVersion}.h";
+ 
+ sub SelectLangOptions {
+ 	my ($Ext) = @_;
+@@ -1793,77 +1791,77 @@
+ 	if ($AsmFilep || $Ext =~ /cia/i) {
+ 		&main::Output(
+ # compile the translated, preprocessed source
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.o"), " : ",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.cpp"), "\n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.o"), " : ",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.cpp"), "\n",
+ 			"\t\@echo $Src\n",
+-			"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)\\$BaseSrc\_.cpp\n",
++			"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)/$BaseSrc\_.cpp\n",
+ 			"\n",
+ # rule to translate the preprocessed source
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.cpp"), " : ",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.pre"), "\n",
+-			"\ttranasm.bat -n -s -o=\$\@ \$(EPOCBLD$Bld)\\$BaseSrc.pre\n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.cpp"), " : ",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.pre"), "\n",
++			"\ttranasm.bat -n -s -o=\$\@ \$(EPOCBLD$Bld)/$BaseSrc.pre\n",
+ 			"\n",
+ # rule to preprocess the source
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.pre"), " : ",
+-			&Generic_Quote("$SrcPath\\$Src"), "\n",
+-			"\t\$(ARMCC$Bld) -E $preinclude $LangOptions -J $SrcPath \$(INCDIR) $SrcPath\\$Src -o \$\@ \n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.pre"), " : ",
++			&Generic_Quote("$SrcPath/$Src"), "\n",
++			"\t\$(ARMCC$Bld) -E $preinclude $LangOptions -J $SrcPath \$(INCDIR) $SrcPath/$Src -o \$\@ \n",
+ # generate an assembly listing target too
+-			"LISTING$Bld$BaseSrc\_ : ", &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.lis"), "\n",
+-			"\t", &Generic_CopyAction("$SrcPath\\$BaseSrc\_.$ABI.lst"),
++			"LISTING$Bld$BaseSrc\_ : ", &Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.lis"), "\n",
++			"\t", &Generic_CopyAction("$SrcPath/$BaseSrc\_.$ABI.lst"),
+ 			"\n",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.lis"), " : ",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.cpp"), "\n",
+-			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)\\$BaseSrc\_.cpp\n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.lis"), " : ",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.cpp"), "\n",
++			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)/$BaseSrc\_.cpp\n",
+ 			"\n"
+ 			);
+ 	} else {
+ 		#If Function Call logging is enabled, add call to function call logger
+ 		if ($Function_Call_Logger) {
+ 			&main::Output(
+-				&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.o"),
++				&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.o"),
+ 				" : ",
+-				&Generic_Quote("\$(EPOCBLD$Bld)\\$Logger_Output"),
++				&Generic_Quote("\$(EPOCBLD$Bld)/$Logger_Output"),
+ 				"\n",
+ 				"\t\@echo $Logger_Output\n",
+-				"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)\\$Logger_Output\n",
++				"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)/$Logger_Output\n",
+ 				"\n",
+ # generate an assembly listing target too
+-				"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), "\n",
+-				"\t", &Generic_CopyAction("$SrcPath\\$BaseSrc.$ABI.lst"),
++				"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), "\n",
++				"\t", &Generic_CopyAction("$SrcPath/$BaseSrc.$ABI.lst"),
+ 				"\n",
+-				&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), " : ",
+-				&Generic_Quote("$SrcPath\\$Logger_Output"), "\n",
+-				"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)\\$Logger_Output \n",
++				&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), " : ",
++				&Generic_Quote("$SrcPath/$Logger_Output"), "\n",
++				"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)/$Logger_Output \n",
+ 				"\n"
+ 			);
+ 
+ 			#Call to Function Call Logger
+ 			&main::Output(
+-				&Generic_Quote("\$(EPOCBLD$Bld)\\$Logger_Output"), " : ",
+-				&Generic_Quote("$SrcPath\\$Src"),
++				&Generic_Quote("\$(EPOCBLD$Bld)/$Logger_Output"), " : ",
++				&Generic_Quote("$SrcPath/$Src"),
+ 				"\n",
+ 				"\t \@echo $Logger_Output\n",
+ 				"\t \$(FCLOGGER$Bld) $lfboption$edg_preinclude \\\n",
+ 			    "\t -I $SrcPath  \\\n",
+ 				"\t \$(INCDIR_FCLOGGER) $FC_Logger_Option \\\n",
+-			    "\t --gen_c_file_name \$\@ $SrcPath\\$Src\n",
++			    "\t --gen_c_file_name \$\@ $SrcPath/$Src\n",
+ 				"\n\n",
+ 			);
+ 		}
+ 		else {			
+ 			&main::Output(
+-				&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.o"), " : ",
+-				&Generic_Quote("$SrcPath\\$Src"), "\n",
++				&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.o"), " : ",
++				&Generic_Quote("$SrcPath/$Src"), "\n",
+ 				"\t\@echo $Src\n",
+-				"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath\\$Src\n",
++				"\t\$(ARMCC$Bld) $lfboption$LangOptions -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath/$Src\n",
+ 				"\n",
+ # generate an assembly listing target too
+-			"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), "\n",
+-			"\t", &Generic_CopyAction("$SrcPath\\$BaseSrc.$ABI.lst"),
++			"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), "\n",
++			"\t", &Generic_CopyAction("$SrcPath/$BaseSrc.$ABI.lst"),
+ 			"\n",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), " : ",
+-			&Generic_Quote("$SrcPath\\$Src"), "\n",
+-			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath\\$Src \n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), " : ",
++			&Generic_Quote("$SrcPath/$Src"), "\n",
++			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath/$Src \n",
+ 			"\n"
+ 			);
+ 			#Compiler wrapper support starts
+@@ -1872,9 +1870,9 @@
+ 				my $Platcmpwrap=&main::Plat;
+ 				&main::Output(
+ 					"COMPWRAP$Bld$BaseSrc : ",
+-					&Generic_Quote("$SrcPath\\$Src"), "\n",
++					&Generic_Quote("$SrcPath/$Src"), "\n",
+ 					"\t\@echo Analysing $Src\n",
+-					"\t\$(COMPWRAP) \$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath\\$Src \n",
++					"\t\$(COMPWRAP) \$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath/$Src \n",
+ 					"\n"
+ 				);
+ 			}
+@@ -1907,12 +1905,12 @@
+ # compile the translated, preprocessed source
+ 		       &main::Output( "OBJECTS$MFVarN = ");
+ 		       foreach my $obj (@{$CompilationGroups{$KeyFile}{Objects}}) {
+-			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)\\$obj"), " "); 
++			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)/$obj"), " "); 
+ 		       }
+        		       &main::Output( "\n\n");
+ 		       &main::Output( "SOURCES$MFVarN = ");
+ 		       foreach my $src (@{$CompilationGroups{$KeyFile}{Sources}}) {
+-			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)\\$src", " "));
++			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)/$src", " "));
+ 		       }
+        		       &main::Output( "\n\n");
+ 		       &main::Output( "\$(OBJECTS$MFVarN) : \$(SOURCES$MFVarN) \n");
+@@ -1927,21 +1925,21 @@
+ 		}
+ 		&main::Output(
+ # rule to translate the preprocessed source
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.cpp"), " : ",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.pre"), "\n",
+-			"\ttranasm.bat -n -s -o=\$\@ \$(EPOCBLD$Bld)\\$BaseSrc.pre\n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.cpp"), " : ",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.pre"), "\n",
++			"\ttranasm.bat -n -s -o=\$\@ \$(EPOCBLD$Bld)/$BaseSrc.pre\n",
+ 			"\n",
+ # rule to preprocess the source
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.pre"), " : ",
+-			&Generic_Quote("$SrcPath\\$Src"), "\n",
+-			"\t\$(ARMCC$Bld) -E $preinclude $LangOptions -J $SrcPath \$(INCDIR) $SrcPath\\$Src -o \$\@ \n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.pre"), " : ",
++			&Generic_Quote("$SrcPath/$Src"), "\n",
++			"\t\$(ARMCC$Bld) -E $preinclude $LangOptions -J $SrcPath \$(INCDIR) $SrcPath/$Src -o \$\@ \n",
+ # generate an assembly listing target too
+-			"LISTING$Bld$BaseSrc\_ : ", &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.lis"), "\n",
+-			"\t", &Generic_CopyAction("$SrcPath\\$BaseSrc\_.$ABI.lst"),
++			"LISTING$Bld$BaseSrc\_ : ", &Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.lis"), "\n",
++			"\t", &Generic_CopyAction("$SrcPath/$BaseSrc\_.$ABI.lst"),
+ 			"\n",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.lis"), " : ",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc\_.cpp"), "\n",
+-			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)\\$BaseSrc\_.cpp\n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.lis"), " : ",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc\_.cpp"), "\n",
++			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ \$(EPOCBLD$Bld)/$BaseSrc\_.cpp\n",
+ 			"\n"
+ 			);
+ 	} else {
+@@ -1953,7 +1951,7 @@
+ #                      compile the source
+ 		       &main::Output( "OBJECTS$MFVarN = ");
+ 		       foreach my $obj (@{$CompilationGroups{$KeyFile}{Objects}}) {
+-			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)\\$obj"), " "); 
++			       &main::Output( &Generic_Quote("\\\n\t\$(EPOCBLD$Bld)/$obj"), " "); 
+ 		       }
+        		       &main::Output( "\n\n");
+ 		       &main::Output( "SOURCES$MFVarN = ");
+@@ -1973,12 +1971,12 @@
+ 		}
+ #		generate an assembly listing target too
+ 		&main::Output(
+-			"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), "\n",
+-			"\t", &Generic_CopyAction("$SrcPath\\$BaseSrc.$ABI.lst"),
++			"LISTING$Bld$BaseSrc : ", &Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), "\n",
++			"\t", &Generic_CopyAction("$SrcPath/$BaseSrc.$ABI.lst"),
+ 			"\n",
+-			&Generic_Quote("\$(EPOCBLD$Bld)\\$BaseSrc.lis"), " : ",
+-			&Generic_Quote("$SrcPath\\$Src"), "\n",
+-			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath\\$Src \n",
++			&Generic_Quote("\$(EPOCBLD$Bld)/$BaseSrc.lis"), " : ",
++			&Generic_Quote("$SrcPath/$Src"), "\n",
++			"\t\$(ARMCC$Bld) $LangOptions -S -J $SrcPath \$(INCDIR) -o \$\@ $SrcPath/$Src \n",
+ 			"\n"
+ 			);
+ 	}
+--- e32plat.pm	2009-09-04 13:39:32.000000000 -0400
++++ e32plat.pm	2009-08-25 15:27:28.000000000 -0400
+@@ -228,7 +228,7 @@
+ 		ASSP=>'MARM',
+ 		ASSPABI=>'',
+ 		Generic=>1,
+-		MakeMod=>'Cl_arm',
++		MakeMod=>'cl_arm',
+ 		Compiler=>'ARMCC',
+ 		DefFile=>'EABI',
+ 		EABI=>1,
+@@ -238,7 +238,7 @@
+ 		ASSP=>'MARM',
+ 		ASSPABI=>'',
+ 		Generic=>1,
+-		MakeMod=>'Cl_arm',
++		MakeMod=>'cl_arm',
+ 		Compiler=>'ARMCC',
+ 		DefFile=>'EABI',
+ 		EABI=>1,
+@@ -250,7 +250,7 @@
+ 		ASSP=>'MARM',
+ 		ASSPABI=>'',
+ 		Generic=>1,
+-		MakeMod=>'Cl_arm',
++		MakeMod=>'cl_arm',
+ 		Compiler=>'ARMCC',
+ 		DefFile=>'EABI',
+ 		EABI=>1,
+--- makmake.pl	2009-09-04 13:39:32.000000000 -0400
++++ makmake.pl	2009-09-04 14:06:33.000000000 -0400
+@@ -140,7 +140,7 @@
+ 	}
+ 	$MMPFILE=&Path_AbsToWork($MMPFILE);
+ 
+-	eval { &Load_ModuleL('Mmp'); };
++	eval { &Load_ModuleL('mmp'); };
+ 	die $@ if $@;
+ 	if ($Options{v}) {
+ 		&Mmp_SetVerbose;
+@@ -439,7 +439,7 @@
+ 
+ # Special handling for non-default invariant makefiles without FEATUREVARIANT in the MMP file
+ # In this situation the default variant makefle is just included into the variant makefile
+-if (${%{&Mmp_TrgType}}{Basic} =~ /^(EXEDLL|EXE|DLL|LIB)$/ && %FeatureVariantInfo && $FeatureVariantInfo{INVARIANT} && $FeatureVariantInfo{NAME} !~ /^default$/i)
++if (${&Mmp_TrgType}{Basic} =~ /^(EXEDLL|EXE|DLL|LIB)$/ && %FeatureVariantInfo && defined $FeatureVariantInfo{INVARIANT} && $FeatureVariantInfo{INVARIANT} && $FeatureVariantInfo{NAME} !~ /^default$/i)
+ 	{
+ 	# Make sure the path exists
+ 	eval { &Path_MakePathL($MAKEFILE); };
+--- prepfile.pm	2009-09-04 13:39:32.000000000 -0400
++++ prepfile.pm	2009-09-04 14:08:38.000000000 -0400
+@@ -115,8 +115,8 @@
+ 		# don't upper case everything until you've done this.
+ 		
+ 		foreach $Macro (@Macros) {
+-			s/\/ _____$Macro /\/$Macro/g;
+-			s/_____$Macro /$Macro/g;
++			#s/\/ _____$Macro /\/$Macro/g;
++			#s/_____$Macro /$Macro/g;
+ 			s/_____$Macro/$Macro/g;
+ 		}
+ 		if(/^macro/i)
diff -Naur gnupoc-package-1.13.orig/sdks/install_openc_16_s60 gnupoc-package-1.13/sdks/install_openc_16_s60
--- gnupoc-package-1.13.orig/sdks/install_openc_16_s60	1969-12-31 19:00:00.000000000 -0500
+++ gnupoc-package-1.13/sdks/install_openc_16_s60	2009-09-17 15:57:38.000000000 -0400
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -e
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <s60_open_c_cpp_plug_in_v1_6_en.zip> <s60-sdk-dir>"
+    exit 1
+fi
+
+openc_tarball=$1
+S60_SDK_DIR=$2
+
+# create temporary directory
+TEMP=$(mktemp -d)
+trap "echo Removing temporary files...; rm -rf $TEMP" EXIT
+
+copy_files()
+{
+    srcdir=$1
+    destdir=$2
+    (cd $srcdir && tar -cf- . | tar -C $destdir -xvf-)
+}
+
+# Install OpenC
+
+unzip -d $TEMP $openc_tarball
+
+# Install C libraries and headers
+# (header files are the same for all SDK versions)
+./unshield/unshield -d $TEMP -g opencepoc32_3.1 x $TEMP/Installer/data1.cab
+./lowercase $TEMP/opencepoc32_3.1/epoc32
+./fixinclude $TEMP/opencepoc32_3.1/epoc32/include
+copy_files $TEMP/opencepoc32_3.1/epoc32/ $S60_SDK_DIR/epoc32/
+
+# Install C++ libraries and headers
+./unshield/unshield -d $TEMP -g opencppepoc32 x $TEMP/Installer/data1.cab
+./lowercase $TEMP/opencppepoc32/epoc32
+./fixinclude $TEMP/opencppepoc32/epoc32/include
+copy_files $TEMP/opencppepoc32/epoc32/ $S60_SDK_DIR/epoc32/
+
+# Install C plugin
+./unshield/unshield -d $TEMP -g opencnokiaplugin x $TEMP/Installer/data1.cab
+./lowercase $TEMP/opencnokiaplugin/nokia_plugin/openc/s60opencex
+./fixinclude $TEMP/opencnokiaplugin/nokia_plugin/openc/s60opencex
+./fixexamples $TEMP/opencnokiaplugin/nokia_plugin/openc/s60opencex
+copy_files $TEMP/opencnokiaplugin/ $S60_SDK_DIR/
+
+# Install C++ plugin
+./unshield/unshield -d $TEMP -g opencppnokiaplugin x $TEMP/Installer/data1.cab
+for d in s60boostex s60opencppex; do
+    ./lowercase $TEMP/opencppnokiaplugin/nokia_plugin/opencpp/$d
+    ./fixinclude $TEMP/opencppnokiaplugin/nokia_plugin/opencpp/$d
+    ./fixexamples $TEMP/opencppnokiaplugin/nokia_plugin/opencpp/$d
+done
+copy_files $TEMP/opencppnokiaplugin/ $S60_SDK_DIR/
diff -Naur gnupoc-package-1.13.orig/sdks/install_rvct_support gnupoc-package-1.13/sdks/install_rvct_support
--- gnupoc-package-1.13.orig/sdks/install_rvct_support	1969-12-31 19:00:00.000000000 -0500
+++ gnupoc-package-1.13/sdks/install_rvct_support	2009-09-17 15:57:38.000000000 -0400
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <s60-sdk-dir>"
+    exit 1
+fi
+
+S60_SDK_DIR=$1
+
+if ! patch --dry-run -f -d $S60_SDK_DIR/epoc32/tools -p0 < gnupoc-s60_50_rvct-patch >/dev/null; then
+    echo "ERROR: RVCT support seems already installed! Exiting..." >&2
+    exit 1
+fi
+
+patch -d $S60_SDK_DIR/epoc32/tools -p0 < gnupoc-s60_50_rvct-patch
+
+cat << "EOF" | sed -f- $S60_SDK_DIR/epoc32/tools/def2dll.bat > $S60_SDK_DIR/epoc32/tools/def2dll.pl
+/@goto invoke/d
+/__END__/,$d
+s,$\(bld\)\?path\\\\,$\1path/,g
+s,^\t$PerlLibPath =~,\t#$PerlLibPath =~,
+/$PerlLibPath \.=/s,\\\\,/,
+s,use Defutl,use defutl,
+s,use Armutl,use armutl,
+s/\xe7//
+s/\x0d$//
+EOF
+
+# wrapper for Windows tools to run with WINE
+cat > $S60_SDK_DIR/epoc32/tools/wine_wrapper.sh << "EOF"
+#!/bin/sh
+DIR=`dirname $0`
+TOOL=`basename $0`
+wine $DIR/$TOOL.exe "$@"
+exit $?
+EOF
+chmod 755 $S60_SDK_DIR/epoc32/tools/wine_wrapper.sh
+ln -s wine_wrapper.sh $S60_SDK_DIR/epoc32/tools/elftran
+ln -s wine_wrapper.sh $S60_SDK_DIR/epoc32/tools/genstubs
+ln -s wine_wrapper.sh $S60_SDK_DIR/epoc32/tools/getexports
+
+# wrapper for tools written in Perl
+cat > $S60_SDK_DIR/epoc32/tools/perl_wrapper.sh << "EOF"
+#!/bin/sh
+DIR=`dirname $0`
+TOOL=`basename $0`
+perl $DIR/$TOOL.pl "$@"
+EOF
+chmod 755 $S60_SDK_DIR/epoc32/tools/perl_wrapper.sh
+ln -s perl_wrapper.sh $S60_SDK_DIR/epoc32/tools/def2dll
diff -Naur gnupoc-package-1.13.orig/sdks/install_wrapper gnupoc-package-1.13/sdks/install_wrapper
--- gnupoc-package-1.13.orig/sdks/install_wrapper	2008-11-30 14:53:48.000000000 -0500
+++ gnupoc-package-1.13/sdks/install_wrapper	2009-09-17 16:04:32.000000000 -0400
@@ -12,7 +12,8 @@
 
 cp sign.sh wrapper.sh gnupoc-common.sh cshlpcmp $DEST
 cd $DEST
-for i in abld bldmake bmconv epoc eshell makekeys makesis makmake mifconv rcomp signsis ; do
+for i in abld bldmake bmconv def2dll elf2e32 elftran epoc eshell genstubs \
+	getexports makekeys makesis makmake mifconv rcomp signsis ; do
 	ln -s wrapper.sh $i
 done
 if [ "`which gmake`" != "" ]; then
diff -Naur gnupoc-package-1.13.orig/tools/install_eka2_tools gnupoc-package-1.13/tools/install_eka2_tools
--- gnupoc-package-1.13.orig/tools/install_eka2_tools	2008-11-27 12:08:21.000000000 -0500
+++ gnupoc-package-1.13/tools/install_eka2_tools	2009-09-17 16:02:49.000000000 -0400
@@ -32,7 +32,6 @@
 cd rcomp-7.0.1 && $MAKE && cp src/rcomp $DEST/bin
 cd makesis-4 && $MAKE && cp src/makesis src/signsis src/makekeys $DEST/bin
 cd make-3.81 && ./configure && $MAKE && cp make $DEST/bin/extmake
-cd elf2e32 && $MAKE -f Makefile.local-libelf libelf.a elf2e32 && cp elf2e32 $DEST/bin
 g++ mifconv.cpp -o $DEST/bin/mifconv
 ln -sf $TRUE $DEST/bin/rem
 cp del $DEST/bin
diff -Naur gnupoc-package-1.13.orig/tools/make-3.81/job.c gnupoc-package-1.13/tools/make-3.81/job.c
--- gnupoc-package-1.13.orig/tools/make-3.81/job.c	2007-08-12 06:55:42.000000000 -0400
+++ gnupoc-package-1.13/tools/make-3.81/job.c	2009-09-17 15:57:38.000000000 -0400
@@ -2499,7 +2499,7 @@
                 if (ap == new_argv[i])
                   p = next_token (p + 1) - 1;
 	      }
-	    else
+	    else if (p[1] != '\0')
               {
 #ifdef HAVE_DOS_PATHS
                 /* Only remove backslashes before characters special to Unixy
@@ -2527,7 +2527,7 @@
 #endif  /* HAVE_DOS_PATHS */
 
                 /* Copy and skip the following char.  */
-                *ap++ = *p;
+                *ap++ = *++p;
               }
 	    break;