diff options
Diffstat (limited to 'solenv/gbuild/ZipPackage.mk')
| -rw-r--r-- | solenv/gbuild/ZipPackage.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk index bc016aed3126..612486c25e0e 100644 --- a/solenv/gbuild/ZipPackage.mk +++ b/solenv/gbuild/ZipPackage.mk @@ -12,20 +12,13 @@ # scp2 can easily deal with zip files but not so easily with 100s of # individual files; ideally the Package itself should be sufficient. -# sigh... WTF does that scp2/installer look for these in bin and not pck??? -gb_Zip_get_outdir_bin_target = $(OUTDIR)/bin/$(1).zip - define gb_ZipPackage_ZipPackage $(call gb_Package_Package,$(1),$(2)) -$(call gb_Zip_Zip_internal_nodeliver,$(1),$(WORKDIR)/Zip/$(1)) -$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1)) -$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1)) - cp $$< $$@ -$(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_target,$(1))).dir +$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) +$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1)) $(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) $(call gb_ZipPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) $(call gb_Helper_make_userfriendly_targets,$(1),ZipPackage) -$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_bin_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1)) endef |