diff options
| author | Andras Timar <atimar@suse.com> | 2011-09-01 09:39:11 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-09-01 09:39:11 +0200 |
| commit | ae4ad0eabe36c4df524c99ae4dc509c0bd36c0c6 (patch) | |
| tree | edba14be2b44a22899a0bfeca4ab660dffcad49c /solenv/bin | |
| parent | 886762160996dfa3fee07cf135e53dfe952ed298 (diff) | |
extend branding options in configure
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index c8e92dcdbe23..e8c2a74db880 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -254,7 +254,7 @@ if ( $installer::globals::globallogging ) { installer::files::save_hash($logging installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref); if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3b.log", $allvariableshashref); } -installer::ziplist::overwrite_ooovendor( $allvariableshashref ); +installer::ziplist::overwrite_branding( $allvariableshashref ); if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3c.log", $allvariableshashref); } diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index f0ea1acaddc7..dc8aeff52ab0 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -749,13 +749,17 @@ sub replace_variables_in_ziplist_variables } ########################################################### -# Overwrite the vendor string in openoffice.lst that is defined in configure +# Overwrite branding data in openoffice.lst that is defined in configure ########################################################### -sub overwrite_ooovendor +sub overwrite_branding { my ($variableshashref) = @_; $variableshashref->{'OOOVENDOR'} = $ENV{'OOO_VENDOR'} , if( defined $ENV{'OOO_VENDOR'} && $ENV{'OOO_VENDOR'} ne "" ); + $variableshashref->{'PROGRESSBARCOLOR'} = $ENV{'PROGRESSBARCOLOR'} , if( defined $ENV{'PROGRESSBARCOLOR'} && $ENV{'PROGRESSBARCOLOR'} ne "" ); + $variableshashref->{'PROGRESSSIZE'} = $ENV{'PROGRESSSIZE'} , if( defined $ENV{'PROGRESSSIZE'} && $ENV{'PROGRESSSIZE'} ne "" ); + $variableshashref->{'PROGRESSPOSITION'} = $ENV{'PROGRESSPOSITION'} , if( defined $ENV{'PROGRESSPOSITION'} && $ENV{'PROGRESSPOSITION'} ne "" ); + $variableshashref->{'PROGRESSFRAMECOLOR'} = $ENV{'PROGRESSFRAMECOLOR'} , if( defined $ENV{'PROGRESSFRAMECOLOR'} && $ENV{'PROGRESSFRAMECOLOR'} ne "" ); } ########################################################### |