Fixed epocroot handling in build_release_package.pl for non-trivial roots

1 files changed, 11 insertions, 0 deletions

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;
             }