summaryrefslogtreecommitdiffstats
path: root/external/msc-externals
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-28 19:30:11 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-28 20:17:26 +0100
commit8df17a34095dce7db16d9d2e505043f806704f66 (patch)
tree80695a18d5364344e1ac1ee376200a96fe569268 /external/msc-externals
parentjvmfwk: rewrite odd conditional (diff)
downloadcore-8df17a34095dce7db16d9d2e505043f806704f66.tar.gz
core-8df17a34095dce7db16d9d2e505043f806704f66.zip
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'external/msc-externals')
-rw-r--r--external/msc-externals/Package_dbghelp.mk2
-rw-r--r--external/msc-externals/Package_msms.mk2
-rw-r--r--external/msc-externals/Package_msvc80_dlls.mk2
-rw-r--r--external/msc-externals/Package_msvc_dlls.mk2
4 files changed, 6 insertions, 2 deletions
diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk
index 438783938152..f6f684a7c077 100644
--- a/external/msc-externals/Package_dbghelp.mk
+++ b/external/msc-externals/Package_dbghelp.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION)))
+$(eval $(call gb_Package_set_outdir,dbghelp,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL)))
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/msc-externals/Package_msms.mk b/external/msc-externals/Package_msms.mk
index 283e11317b88..9ffa294cf414 100644
--- a/external/msc-externals/Package_msms.mk
+++ b/external/msc-externals/Package_msms.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,msms,$(MSM_PATH)))
+$(eval $(call gb_Package_set_outdir,msms,$(OUTDIR)))
+
$(eval $(call gb_Package_add_files,msms,bin,\
$(MERGE_MODULES) \
))
diff --git a/external/msc-externals/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk
index 5e510801d818..0a2feeda2f84 100644
--- a/external/msc-externals/Package_msvc80_dlls.mk
+++ b/external/msc-externals/Package_msvc80_dlls.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH)))
+$(eval $(call gb_Package_set_outdir,msvc80_dlls,$(OUTDIR)))
+
$(eval $(call gb_Package_add_files,msvc80_dlls,bin,\
$(MSVC80_DLLS) \
))
diff --git a/external/msc-externals/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk
index dd68f10c4f95..d82dd06c3cec 100644
--- a/external/msc-externals/Package_msvc_dlls.mk
+++ b/external/msc-externals/Package_msvc_dlls.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
-$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\
$(MSVC_DLLS) \
))