diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-24 16:52:31 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:29:03 +0100 |
| commit | 5ea827280149bc47592bf570278373f111e8ed52 (patch) | |
| tree | 106b83ce2644b120266f8432f0e4d05cd3d167ab /solenv/gbuild | |
| parent | 20a30f13896779fbedc01b70deb290f42b70c1c3 (diff) | |
hardcode manifest source path again
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 0a7a3cd7e64b..86c1c1db975e 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -92,7 +92,7 @@ $(call gb_Extension_get_target,%) : \ mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \ $(call gb_Extension_get_rootdir,$*)/registration && \ $(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \ - $(call gb_Extension__subst_platform,$(MANIFEST),$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \ + $(call gb_Extension__subst_platform,$(LOCATION)/manifest.xml,$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \ cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \ cd $(call gb_Extension_get_rootdir,$*) && \ $(gb_Extension_ZIPCOMMAND) -rX --filesync \ @@ -110,8 +110,6 @@ $(call gb_Extension_get_target,%) : \ define gb_Extension_Extension $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration $(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) -$(call gb_Extension_get_target,$(1)) : MANIFEST := $(SRCDIR)/$(2)/manifest.xml -$(call gb_Extension_get_target,$(1)) : $$(MANIFEST) $(call gb_Extension_get_target,$(1)) : PLATFORM := $(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml @@ -126,12 +124,6 @@ $(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1 endef -# Set custom manifest -define gb_Extension_set_manifest -$(call gb_Extension_get_target,$(1)) : MANIFEST := $(2) - -endef - # Set platform. # # Only use this if the extension is platform-dependent. |