diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-12-01 12:19:49 -0800 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-02 05:19:16 +0100 |
| commit | 3c9408f069658fca3e3d29eb09005ae0c7d3f3e2 (patch) | |
| tree | ef5b8e26baa823f431966b3a55584c74798f0e9f /solenv | |
| parent | 7f90730aa55d011716c8115af6fe8198358b06e5 (diff) | |
msi: LibreOffice does not use SystemFolder, don't define it
LibreOffice does not install anything into SystemFolder (i.e. into
C:\WINDOWS\SYSTEM32 or similar). However, merge module of MS VC++
Runtime does. And if SystemFolder defined in MSM is different than
SystemFolder defined in base MSI, then a conflict will occur, and
merge will fail.
Change-Id: I33649babcd33575aa17cd0e3c0ab612a81ceec98
(cherry picked from commit af7a972fbc29631b7844440a9fc6863a2b9ae9da)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/directory.pm | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 163486e2fbf5..5a7423aa48f8 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -82,7 +82,6 @@ BEGIN $templatefolder = "TemplateFolder"; $templatefoldername = "Templates"; $programmenufolder = "ProgramMenuFolder"; - $systemfolder = "SystemFolder"; $lcidlistname = $ENV{'SRCDIR'} . "/l10ntools/source/ulfconv/msi-encodinglist.txt"; $msilanguage = ""; # hash reference for msi languages LCID $sofficeiconadded = 0; diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index e4100fe8509e..b84b05a4bcc8 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -507,9 +507,6 @@ sub add_root_directories push(@{$directorytableref}, $oneline); } - $oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n"; - push(@{$directorytableref}, $oneline); - my $localtemplatefoldername = $installer::globals::templatefoldername; my $directorytableentry = $localtemplatefoldername; my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir"); |