From 059adbe7ab7b3334641752419b93e5b1eddfe40d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 17 Jun 2020 15:34:53 +0200 Subject: 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. --- solenv/bin/modules/installer/environment.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/bin') 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"; -- cgit