summaryrefslogtreecommitdiff
path: root/solenv/bin/modules
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-02-02 09:26:30 -0800
committerDavid Ostrovsky <david@ostrovsky.org>2015-02-03 11:58:34 +0000
commit06bc1914ddf2e3d814f9589ce0ae84e5e708a7c3 (patch)
treed0fab73fddf5360e060b81ab25a8adfd6401e059 /solenv/bin/modules
parent4daafaf5ac501e1a9f040fbc0c428763b3614d95 (diff)
MSI packaging tweaks for Windows 64-bit
Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5 Reviewed-on: https://gerrit.libreoffice.org/14283 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'solenv/bin/modules')
-rw-r--r--solenv/bin/modules/installer/windows/directory.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index b84b05a4bcc8..a1d677393334 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -62,9 +62,9 @@ sub overwrite_programfilesfolder
{
my ( $allvariables ) = @_;
- if ( $allvariables->{'PROGRAMFILESFOLDERNAME'} )
+ if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 ))
{
- $installer::globals::programfilesfolder = $allvariables->{'PROGRAMFILESFOLDERNAME'};
+ $installer::globals::programfilesfolder = "ProgramFiles64Folder";
}
}