diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-06-17 15:34:53 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-06-17 15:40:28 +0200 |
| commit | 059adbe7ab7b3334641752419b93e5b1eddfe40d (patch) | |
| tree | 4ecfee2cd9c806710ffd5df34c2ae4aff0c9329b /solenv | |
| parent | 83a4d3272aa4a4bd875abc9964f4e4e7aadd1b4e (diff) | |
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.
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"; |