diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-07 12:58:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-08 04:03:31 -0600 |
| commit | 7b3133ad882b24834f87b478d00bf4ee92d3cd63 (patch) | |
| tree | e0eb51389ad9e3395775e918a8b962e3b6c2170f /solenv | |
| parent | 2203611500f1fdeb63ed1fd1dfedbdb11dec968e (diff) | |
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 <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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; |