diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 13:23:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:34 +0100 |
| commit | 0f5792b8f4aa90a1ca9f1318e635ed101cc00b8a (patch) | |
| tree | bc4e2ce4b2a1b2b8bcd7663b40a705f8fb155e57 /external/msc-externals | |
| parent | 542baebc307942d6aa53bd7a11652d689fc69216 (diff) | |
msc-externals: dbghelp.dll to INSTDIR, and only if ENABLE_CRASHDUMP
Change-Id: I3955a163e5a78b445e276eb01d37fca111877d35
Diffstat (limited to 'external/msc-externals')
| -rw-r--r-- | external/msc-externals/Module_msc-externals.mk | 2 | ||||
| -rw-r--r-- | external/msc-externals/Package_dbghelp.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 1caa327fc64f..275c9ff07c80 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,msc-externals)) $(eval $(call gb_Module_add_targets,msc-externals,\ - Package_dbghelp \ + $(if $(ENABLE_CRASHDUMP),Package_dbghelp) \ $(if $(MSM_PATH),Package_msms) \ Package_msvc_dlls \ $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk index f6f684a7c077..d039b07d42a5 100644 --- a/external/msc-externals/Package_dbghelp.mk +++ b/external/msc-externals/Package_dbghelp.mk @@ -9,8 +9,6 @@ $(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))) +$(eval $(call gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL))) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |