solenv/bin/modules/installer/environment.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 059adbe7ab7b3334641752419b93e5b1eddfe40d
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Jun 17 15:34:53 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 17 15:40:28 2020 +0200
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.
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";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
