diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 12:54:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 14:03:14 +0100 |
| commit | 3af414b48b2882636de3ab8c84ab4c514daf6235 (patch) | |
| tree | ffa74044990d1cab2c6e9879c175ad5184cd5f66 /solenv/gbuild/CliAssembly.mk | |
| parent | e5eac916e89d064fa2bb48b17e121e35da1141fc (diff) | |
gbuild: deliver CLI config and policy files to INSTDIR
Change-Id: I93aaf87b53c17fb143e6e6ae0bca60777dbb3eb5
Diffstat (limited to 'solenv/gbuild/CliAssembly.mk')
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index f8c6fdb8a729..7c6e3b7b2c45 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -148,9 +148,11 @@ $(call gb_CliAssembly_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CLA,3) rm -f $(call gb_CliAssembly_get_target,$*) +# call gb_CliAssembly_CliAssembly,dllname,dlltarget define gb_CliAssembly_CliAssembly $(call gb_CliAssemblyTarget_CliAssemblyTarget,$(1)) $(call gb_Package_Package_internal,$(1)_assembly,$(WORKDIR)) +$(call gb_Package_set_outdir,$(1)_assembly,$(dir $(2))) $(call gb_CliAssembly_get_target,$(1)) : $(call gb_CliAssemblyTarget_get_target,$(1)) $(call gb_CliAssembly_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_assembly) @@ -160,7 +162,7 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe endef define gb_CliAssembly__add_file -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) +$(call gb_Package_add_file,$(1)_assembly,$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) endef |