[ooo-build-commit] .: solenv/bin

[Petr Mladek]

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

New commits:
commit ded7380bec82112094cce35ef010270fbb11ca9d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Sep 22 12:57:01 2010 +0200

    Install file into /opt/{UNIXBASISROOTNAME}{BRANDPACKAGEVERSION} by default
    
    We modified scp2 to install everything into single directory =>
    packagerootpath must be set to /<prefix>/<app-dir> instead of /<prefix>
    Without this fix, it puts everything directly under /opt in the credated
    rpms.

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 97ec880..18ca35c 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