[Libreoffice-commits] .: solenv/bin

[Petr Mladek]

 solenv/bin/make_installer.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e86793701d0d15af761bfeb8b2ed250a266080b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 21 16:44:03 2010 +0200

    install into /opt/libreoffice instead of /opt/libreoffice3
    
    discussed on the mailing list

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 9c6c771..441f28d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1421,8 +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'}"; }
+                # we put branding and common stuff into the same prefix on unixes => $packagerootpath must be the whole prefix, including the product name
+                if ($installer::globals::isunix) { $packagerootpath .= "/$allvariableshashref->{'UNIXBASISROOTNAME'}"; }
                 if ( $^O =~ /darwin/i ) { $packagerootpath =~ s/\/opt\//\/Applications\//; }
             }
             else