diff options
| -rw-r--r-- | external/Package_msvc_dlls.mk | 4 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk index b8bec8fe18c0..cbf09aa15ecb 100644 --- a/external/Package_msvc_dlls.mk +++ b/external/Package_msvc_dlls.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH))) -$(eval $(call gb_Package_add_files,msvc_dlls,bin,\ +$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\ $(MSVC_DLLS) \ )) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index f3cdc7af9bd6..50ec864739da 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -82,7 +82,7 @@ LibreOffice downloadname LibreOffice_{productversion}_{os}_install_{languages} langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath} + include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath} } } @@ -138,7 +138,7 @@ LibreOffice_Dev downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath} + include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath} } } diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 9e2b880a4566..63689a0158e6 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -39,6 +39,9 @@ sub create_pathvariables my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension; $variables{'solarcommonpath'} = $solarcommonpath; + my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl"; + $variables{'shlxthdlpath'} = $shlxthdlpath; + $variables{'os'} = $installer::globals::compiler; my $solarenvpath = ""; |