fdo#65975: do not put MSVC 64bit runtimes in solver/bin

Apparently causes problems for some people.

Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.

Change-Id: I7a01160369ed8dc401625c06760008341afcee67

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) \
 ))
 

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}
     }
 }
 

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 = "";