From 4d160a78ad47ee3b2eb1b1ecda172a1c41c328a1 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 17 Jun 2005 08:49:25 +0000 Subject: [PATCH] INTEGRATION: CWS sb31 (1.8.8); FILE MERGED 2005/06/02 13:24:56 sb 1.8.8.2: RESYNC: (1.8-1.9); FILE MERGED 2005/06/02 09:56:28 sb 1.8.8.1: #121932# Changes for URE wntmsci10. --- solenv/bin/modules/installer/windows/directory.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 8845ebf614e8..26d5da73f08e 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -2,9 +2,9 @@ # # $RCSfile: directory.pm,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: rt $ $Date: 2005-05-13 09:42:38 $ +# last change: $Author: obo $ $Date: 2005-06-17 09:49:25 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -187,6 +187,9 @@ sub add_root_directories my $productname = $allvariableshashref->{'PRODUCTNAME'}; my $productversion = $allvariableshashref->{'PRODUCTVERSION'}; my $productkey = $productname . " " . $productversion; + + if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) { $productkey = $productname; } + my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir"); # third parameter not used $shortproductkey =~ s/\s/\_/g; # changing empty space to underline