diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-23 17:41:59 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-23 17:45:56 +0100 |
| commit | 88b5b3688e516666fa693353a542b6c8302e6a45 (patch) | |
| tree | efe6e937a408e410f0da864a3196cafc87c4475a | |
| parent | e3f70a05b3e590fcb2e75cd4e380e2f3a0530c18 (diff) | |
gb_Jar_add_packagefile needs three args after all
This partially reverts commit 713e536fe987f4dbd901656fda19ec4908a0a2f1 .
| -rw-r--r-- | solenv/gbuild/Jar.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index b5ba394ee7ac..f1fe1444c8f4 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -127,11 +127,10 @@ endef # PACKAGEFILES is the list of all root files to pack into the jar define gb_Jar_add_packagefile $(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2) - -endef - -define gb_Jar_add_packagefiles -$(foreach packagefile,$(2),$(call gb_Jar_add_packagefile,$(1),$(packagefile))) +$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2)) +$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1))) + mkdir -p $$(dir $$@) + cp -rf $(3) $$@ endef |