diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-23 18:58:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-23 19:42:37 +0200 |
| commit | 10f4e767f004dc464a244618fc611bc700c6cb74 (patch) | |
| tree | 03be657648a43f21acd9170ddf1fbfff739fbaf4 /solenv | |
| parent | gbuild: make ct2n module work (diff) | |
| download | core-10f4e767f004dc464a244618fc611bc700c6cb74.tar.gz core-10f4e767f004dc464a244618fc611bc700c6cb74.zip | |
gbuild: let ExtensionTarget expect manifest below META-INF
Change-Id: Ia07d3fd856578ab6976c02f8a0ec96273db19a2c
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 286e9d79b025..f9c1ec3a25da 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -118,7 +118,7 @@ $(call gb_ExtensionTarget_get_target,%) : \ mkdir -p $(call gb_ExtensionTarget_get_rootdir,$*)/META-INF \ $(if $(LICENSE),$(call gb_ExtensionTarget_get_rootdir,$*)/registration) && \ $(call gb_ExtensionTarget__subst_platform,$(call gb_ExtensionTarget_get_workdir,$*)/description.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/description.xml) && \ - $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \ + $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/META-INF/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \ $(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \ $(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ @@ -138,7 +138,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ - $(SRCDIR)/$(2)/description.xml + $(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget__get_preparation_target,$(1)) |