diff options
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/pathanalyzer.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 335ecf961253..dd093f1c1e45 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1421,6 +1421,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) { $packagerootpath = $onepackage->{'destpath'}; installer::packagelist::resolve_packagevariables(\$packagerootpath, $allvariableshashref, 1); + # we put branding and common stuff into the same prefix on unixes => $packagerootpath must be the whole prefix, including product name and version + if ($installer::globals::isunix) { $packagerootpath .= "/$allvariableshashref->{'UNIXBASISROOTNAME'}$allvariableshashref->{'BRANDPACKAGEVERSION'}"; } if ( $^O =~ /darwin/i ) { $packagerootpath =~ s/\/opt\//\/Applications\//; } } else diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm index 1c57a0d76e02..62085dac5e14 100644 --- a/solenv/bin/modules/installer/pathanalyzer.pm +++ b/solenv/bin/modules/installer/pathanalyzer.pm @@ -39,7 +39,7 @@ sub get_path_from_fullqualifiedname if ( $$longfilenameref =~ /\Q$installer::globals::separator\E/ ) # Is there a separator in the path? Otherwise the path is empty. { - if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ ) + if ( $$longfilenameref =~ /^\s*(.*\Q$installer::globals::separator\E)(.+)/ ) { $$longfilenameref = $1; } |