From 8df17a34095dce7db16d9d2e505043f806704f66 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 28 Oct 2013 19:30:11 +0100 Subject: gbuild: set Package default target to INSTDIR Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186 --- external/msc-externals/Package_dbghelp.mk | 2 ++ external/msc-externals/Package_msms.mk | 2 ++ external/msc-externals/Package_msvc80_dlls.mk | 2 ++ external/msc-externals/Package_msvc_dlls.mk | 2 -- 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'external/msc-externals') 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) \ )) -- cgit