diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-06-17 15:34:53 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-03-30 16:33:42 +0200 |
| commit | 07c0ea7d6335602941e437143562978688f6d6a2 (patch) | |
| tree | e32cd9d2bf25c24a3b716bfd9ddf4546f514ba96 /solenv | |
| parent | dded71cdf1045c1622e98895cdfb623020c659dd (diff) | |
[cp] Revert "Revert "Restore original $licensepath of the optional EULA
of MSI package""
This reverts commit ce7c473dfb6a0eeab99811b29e205fa8b5379f9d.
I don't remember why I had to revert my original patch on master a year ago.
But for Collabora Office builds it has to be like this, apparently.
Change-Id: I00be2ddb439b9354ee05b891023162ad40a90509
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 2 |
1 files changed, 1 insertions, 1 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"; |