diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-25 13:21:03 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-25 13:21:03 (GMT) |
| commit | 0683ee31f0b08a7f75c89ee2e12399c404c29c60 (patch) | |
| tree | b717b79b67ae1ea01866799ac6d5cefd26927d58 /bin/createpackage.pl | |
| parent | 237c2afc0846224e00e5889c2c3ee8bde583689d (diff) | |
| parent | f2fa66d3dd722d88c651738bef7b1ccb3c91c156 (diff) | |
| download | Qt-0683ee31f0b08a7f75c89ee2e12399c404c29c60.zip Qt-0683ee31f0b08a7f75c89ee2e12399c404c29c60.tar.gz Qt-0683ee31f0b08a7f75c89ee2e12399c404c29c60.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'bin/createpackage.pl')
| -rwxr-xr-x | bin/createpackage.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 4597b04..7e87758 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -146,9 +146,9 @@ my $signed_sis_name = $pkgoutputbasename.".sis"; my $scriptpath = dirname(__FILE__); my $certtext = $certificate; my $certpath = $scriptpath; -$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash -$certpath = $certpath."../"; # certificates are one step up in hierarcy -$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash +$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-bin\\$-src\\s60installs\\-; # certificates are one step up in hierarcy # Check some pre-conditions and print error messages if needed unless (length($templatepkg) && length($platform) && length($target)) { |