gbuild: deliver CLI config and policy files to INSTDIR

Change-Id: I93aaf87b53c17fb143e6e6ae0bca60777dbb3eb5

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
 

solenv/gbuild/CliLibrary.mk

@@ -61,7 +61,7 @@ $(call gb_CliLibrary_get_clean_target,%) :
 #
 # gb_CliLibrary_CliLibrary target
 define gb_CliLibrary_CliLibrary
-$(call gb_CliAssembly_CliAssembly,$(1))
+$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliLibrary_get_target,$(1)))
 
 $(call gb_CliLibrary_get_target,$(1)) : CLI_ASSEMBLIES :=
 $(call gb_CliLibrary_get_target,$(1)) : CLI_SOURCES :=

solenv/gbuild/CliNativeLibrary.mk

@@ -39,7 +39,7 @@ $(call gb_CliNativeLibrary_get_clean_target,%) :
 #
 # CliNativeLibrary target
 define gb_CliNativeLibrary_CliNativeLibrary
-$(call gb_CliAssembly_CliAssembly,$(1))
+$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliNativeLibrary_get_target,$(1)))
 
 $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES := $(gb_Helper_MISCDUMMY)
 $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_KEYFILE :=

solenv/gbuild/CliUnoApi.mk

@@ -43,7 +43,7 @@ $(call gb_CliUnoApi_get_clean_target,%) :
 #
 # gb_CliUnoApi_CliUnoApi target
 define gb_CliUnoApi_CliUnoApi
-$(call gb_CliAssembly_CliAssembly,$(1))
+$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliUnoApi_get_target,$(1)))
 
 $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_API :=
 $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES :=