diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-27 13:29:08 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-27 13:30:22 +0000 |
| commit | 31f9f18f86a4dd587661f210cd866f6ce1608634 (patch) | |
| tree | 07ed8369f377e2ae4c709263fe8bc844d044b8f3 /external | |
| parent | 4e11246cc8f0b39562daf083e894ded86a8e2146 (diff) | |
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.
(cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17)
Conflicts:
instsetoo_native/util/openoffice.lst.in
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
Reviewed-on: https://gerrit.libreoffice.org/4576
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/Package_msvc_dlls.mk | 4 |
1 files changed, 3 insertions, 1 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) \ )) |