From 7b3133ad882b24834f87b478d00bf4ee92d3cd63 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 7 Nov 2013 12:58:33 +0100 Subject: instsetoo_native: shouldn't need instdir in include path get_Source_Directory_For_Files_From_Includepathlist already has a special hack to find all the files in instdir so ideally it should not be necessary to put these directories on the include path. Clean up readlicense_oo to make that possible; also copying license.txt as-is to LICENSE on Unix but first converting it on WNT is rather silly... Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c Reviewed-on: https://gerrit.libreoffice.org/6613 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- solenv/bin/modules/installer/environment.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index cdabfd50ace1..cce32e4ab746 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -52,9 +52,6 @@ sub create_pathvariables my $platformname = $environment->{'OUTPATH'}; $variables{'platformname'} = $platformname; - my $instdir = $ENV{'INSTROOT'}; - $variables{'instdir'} = $instdir; - my $installscriptdir = $environment->{'WORKDIR'} . $installer::globals::separator . "InstallScriptTarget"; $variables{'installscriptdir'} = $installscriptdir; @@ -67,6 +64,9 @@ sub create_pathvariables my $filelistpath = $environment->{'WORKDIR'}; $variables{'filelistpath'} = $filelistpath; + my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license"; + $variables{'licensepath'} = $licensepath; + my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo"; $variables{'packinfopath'} = $packinfopath; -- cgit v1.2.3