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

INTEGRATION: CWS c01v005 (1.7.16); FILE MERGED

Browse source 
2005/03/10 13:59:35 is 1.7.16.1: #119245# no sun directory for c01
This commit is contained in:
Oliver Bolte 2005-03-15 11:59:33 +00:00
parent 424013afb5
commit 3bf620080e
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
solenv/bin/modules/installer/windows/directory.pm
View file

@ -2,9 +2,9 @@
#
# $RCSfile: directory.pm,v $
#
# $Revision: 1.7 $
# $Revision: 1.8 $
#
# last change: $Author: vg $ $Date: 2005-02-24 16:22:28 $
# last change: $Author: obo $ $Date: 2005-03-15 12:59:33 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -190,23 +190,19 @@ sub add_root_directories
my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir"); # third parameter not used
$shortproductkey =~ s/\s/\_/g; # changing empty space to underline
if ( $installer::globals::isopensourceproduct )
if ( $allvariableshashref->{'SUNDIR'} )
{
$oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t$shortproductkey|$productkey\n";
push(@{$directorytableref}, $oneline);
}
else
{
# my $manufacturer = $installer::globals::sundirname;
# my $shortmanufacturer = installer::windows::idtglobal::make_eight_three_conform($manufacturer, "dir"); # third parameter not used
# $shortmanufacturer =~ s/\s/\_/g; # changing empty space to underline
$oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n";
push(@{$directorytableref}, $oneline);
$oneline = "INSTALLLOCATION\tsundirectory\t$shortproductkey|$productkey$sourcediraddon\n";
push(@{$directorytableref}, $oneline);
}
else
{
$oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t$shortproductkey|$productkey\n";
push(@{$directorytableref}, $oneline);
}
$oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
push(@{$directorytableref}, $oneline);