# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1280608340 -3600
# Node ID df16950e242e43b17f67470b5a5d38a2fda56e0d
# Parent  06e2064de820d289a8e518f18d7a0d11a65aa347# Parent  0653c7ef68b26a0423b34e7ac5406bf909069ecf
merge

diff -r 06e2064de820 -r df16950e242e build/common/common.mmh
diff -r 06e2064de820 -r df16950e242e tools/fsh-buildsis
--- a/tools/fsh-buildsis	Sat Jul 31 18:44:26 2010 +0100
+++ b/tools/fsh-buildsis	Sat Jul 31 21:32:20 2010 +0100
@@ -127,7 +127,7 @@
   my $unsignedSisFileName = $sisFileName;
   $unsignedSisFileName =~ s/\.sis/\.unsigned\.sis/i;
   fshu::MakePath(dirname($unsignedSisFileName));
-  $command = "makesis -d$ENV{EPOCROOT} $tempFileName $unsignedSisFileName 2>&1";
+  $command = "$ENV{EPOCROOT}epoc32\\tools\\makesis -d$ENV{EPOCROOT} $tempFileName $unsignedSisFileName 2>&1";
   print "Running \"$command\"\n" if ($options{verbose});
   my $exitcode = system($command) >> 8;
   print "\n"; # Makesis doesn't do this