diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-04-18 02:16:38 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-13 11:50:27 +0100 |
| commit | 4157921a0741b292e322d4306e6a520ef4dd528e (patch) | |
| tree | 030493282cd49177ee5d8af5a1d98e3edddc29c9 /solenv/bin | |
| parent | 7606557ee755698443acb97fad5445ace8b2cfbb (diff) | |
[cp] Collabora Office EULA
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/idtglobal.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index b45227f8a1a4..05dfdbfb6787 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -59,7 +59,7 @@ sub create_pathvariables my $filelistpath = $environment->{'WORKDIR'}; $variables{'filelistpath'} = $filelistpath; - my $licensepath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget/readlicense_oo/license"; + my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license"; $variables{'licensepath'} = $licensepath; my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo"; diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 26c8e951c9c9..00c466b459e3 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -813,7 +813,7 @@ sub get_rtflicensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "license_" . $language . ".rtf"; + my $licensefilename = "EULA_en-US.rtf"; my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1); |