summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-06-27 13:29:08 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-27 14:07:45 +0200
commit9a6d5f15afa16e68d38e4a0cfd5ef904be481a17 (patch)
tree79dd495ba90481e306a2045b98cf6bbba16ff8cd /external
parent315c31721ac849e201d5f5c9097226306a7a1c00 (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. Change-Id: I7a01160369ed8dc401625c06760008341afcee67
Diffstat (limited to 'external')
-rw-r--r--external/Package_msvc_dlls.mk4
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) \
))