strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native51 (1.26.250); FILE MERGED

Browse source 
2006/06/19 15:03:24 is 1.26.250.1: #i65950# checking version of makecab.exe
This commit is contained in:
Kurt Zenker 2006-07-05 20:13:07 +00:00
parent df400cfb09
commit 110840c387
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
solenv/bin/modules/installer/scriptitems.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: scriptitems.pm,v $
#
# $Revision: 1.26 $
# $Revision: 1.27 $
#
# last change: $Author: hr $ $Date: 2005-11-17 17:59:47 $
# last change: $Author: kz $ $Date: 2006-07-05 21:13:07 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -1004,8 +1004,11 @@ sub add_License_Files_into_Installdir
{
my $onefile = ${$filesarrayref}[$i];
my $destination = $onefile->{'destination'};
my $styles = "";
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
if ( $destination =~ /^\s*share\Q$installer::globals::separator\Ereadme\Q$installer::globals::separator\E(\w+?)_?$defaultlanguage\.?(\w*)\s*/ )
if ( ( $destination =~ /^\s*share\Q$installer::globals::separator\Ereadme\Q$installer::globals::separator\E(\w+?)_?$defaultlanguage\.?(\w*)\s*/ )
|| (( $styles =~ /\bROOTLICENSEFILE\b/ ) && ( $destination =~ /\Q$installer::globals::separator\E?(\w+?)_?$defaultlanguage\.?(\w*?)\s*$/ )) )
{
my $filename = $1;
my $extension = $2;