diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-24 08:37:51 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-24 08:37:51 +0100 |
| commit | 352ae5edff34f6ccbe926a08d86f3b66f08c764a (patch) | |
| tree | ef438a4422e37d57082c5fdea7c8d726275f0afd | |
| parent | c4f73c1e7bb5417b2c1e416c97d25d822fa36359 (diff) | |
| parent | 88b5b3688e516666fa693353a542b6c8302e6a45 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/gbuild_java
| -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 |