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 /solenv | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/Package_gdb.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Package.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index 24dc51c60531..aca8286af4f9 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) +$(eval $(call gb_Package_set_outdir,solenv_gdb,$(OUTDIR))) + # keep in sync with solenv/bin/install-gdb-printers $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(if $(MERGELIBS), \ diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index febb505fa020..37b3e079c1de 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -85,7 +85,7 @@ $(call gb_Package_get_target,%) : # for other targets that want to create Packages, does not register at Module define gb_Package_Package_internal gb_Package_SOURCEDIR_$(1) := $(2) -gb_Package_OUTDIR_$(1) := $(OUTDIR) +gb_Package_OUTDIR_$(1) := $(INSTROOT) $(call gb_Package_get_target,$(1)) : FILES := $(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1)) $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1)) @@ -113,7 +113,7 @@ endef # Set output dir for the package files. # -# Default is $(OUTDIR). +# Default is $(INSTROOT). # # gb_Package_set_outdir package outdir define gb_Package_set_outdir |