diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 19:30:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:26 +0100 |
| commit | 8df17a34095dce7db16d9d2e505043f806704f66 (patch) | |
| tree | 80695a18d5364344e1ac1ee376200a96fe569268 /external/mingw-externals | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'external/mingw-externals')
| -rw-r--r-- | external/mingw-externals/Package_jawt.mk | 2 | ||||
| -rw-r--r-- | external/mingw-externals/Package_mingw_dlls.mk | 2 | ||||
| -rw-r--r-- | external/mingw-externals/Package_mingw_gccdlls.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk index cc58cf9f5ab2..bd2ed1a48b18 100644 --- a/external/mingw-externals/Package_jawt.mk +++ b/external/mingw-externals/Package_jawt.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk index c85032a3c60e..65a042d4d0b2 100644 --- a/external/mingw-externals/Package_mingw_dlls.mk +++ b/external/mingw-externals/Package_mingw_dlls.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) -$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT))) - $(eval $(call gb_Package_add_files,mingw_dlls,bin,\ $(sort $(MINGW_DLLS)) \ )) diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk index 521db37da155..d3f94d1af1fa 100644 --- a/external/mingw-externals/Package_mingw_gccdlls.mk +++ b/external/mingw-externals/Package_mingw_gccdlls.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \ |