summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTamas Bunth <tamas.bunth@collabora.co.uk>2019-03-04 16:54:06 +0100
committerAndras Timar <andras.timar@collabora.com>2019-03-30 22:40:11 +0100
commit89236e16df20cc03ede3dc2b7b10f857f28beb25 (patch)
tree3b040b3e8ca16e715a405e90a5850512a578995a /solenv
parent1e7aa2d8a0a0aecc0e24475d7b987c3d8ad2d1b8 (diff)
single source file for licensing info with conditional text
... for easier maintenance. This commit only introduces the framework. Follow up commits will update the license file. Advantages: * single source, multiple outputs (html, txt) * conditional text, i.e. output will not include license terms of components that are not configured in the build Change-Id: I0ffad41119228a0a26fd1b6ce19930ca6085adb2 Reviewed-on: https://gerrit.libreoffice.org/69396 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/environment.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 38448a8ba9fb..7cb2b9aa15a1 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->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license";
+ my $licensepath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget/readlicense_oo/license";
$variables{'licensepath'} = $licensepath;
my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";