Kaydet (Commit) 22036115 authored tarafından Michael Stahl's avatar Michael Stahl

installer: remove (now unnecessary) shlxthdlpath

Change-Id: Ic84cdc33f470ce3ed143d86add04a422f8b9e365
Reviewed-on: https://gerrit.libreoffice.org/6614Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 560b2761
......@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
......@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
......
......@@ -33,9 +33,6 @@ sub create_pathvariables
# The following variables are needed in the path file list
# solarenvpath, os, pmiscpath
my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl";
$variables{'shlxthdlpath'} = $shlxthdlpath;
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment