diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-27 13:29:08 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-27 13:30:22 +0000 |
| commit | 31f9f18f86a4dd587661f210cd866f6ce1608634 (patch) | |
| tree | 07ed8369f377e2ae4c709263fe8bc844d044b8f3 /solenv | |
| parent | 4e11246cc8f0b39562daf083e894ded86a8e2146 (diff) | |
fdo#65975: do not put MSVC 64bit runtimes in solver/bin
Apparently causes problems for some people.
Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.
(cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17)
Conflicts:
instsetoo_native/util/openoffice.lst.in
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
Reviewed-on: https://gerrit.libreoffice.org/4576
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 9e2b880a4566..63689a0158e6 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -39,6 +39,9 @@ sub create_pathvariables my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension; $variables{'solarcommonpath'} = $solarcommonpath; + my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl"; + $variables{'shlxthdlpath'} = $shlxthdlpath; + $variables{'os'} = $installer::globals::compiler; my $solarenvpath = ""; |