From 34b2757159453e21c68d76fdb47e27f622c144fe Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 14 May 2009 14:05:28 +0300
Subject: Fixed epocroot handling in build_release_package.pl for non-trivial
 roots

---
 bin/build_release_package.pl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bin/build_release_package.pl b/bin/build_release_package.pl
index aecfb207a6..0a350623da 100644
--- a/bin/build_release_package.pl
+++ b/bin/build_release_package.pl
@@ -47,6 +47,13 @@ if (@ARGV)
         $epocroot = "\\";
     }
 
+    if ($epocroot =~ m/.*[^\\]$/)
+    {
+        $epocroot = "${epocroot}\\";
+    }
+
+    $epocroot =~ s/.://;
+
     my $releaseDirQt = "${releaseDir}\\qt";
     my $releaseDirEpocroot = "${releaseDir}\\epocroot";
     my $releaseDirSis = "${releaseDir}\\sis";
@@ -128,6 +135,10 @@ if (@ARGV)
             else
             {
                 $destinationPath =~ s/.://;
+                if ($epocroot !~ m/\\/)
+                {
+                    $destinationPath =~ s/($epocroot)//i;
+                }
                 $destinationPath = $releaseDirEpocroot.$destinationPath;
             }
 
-- 
cgit v1.2.3