gbuild: let ExtensionTarget expect manifest below META-INF

Change-Id: Ia07d3fd856578ab6976c02f8a0ec96273db19a2c

ct2n/UnpackedTarball_ct2n.mk

@@ -16,13 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
 	ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
 ))
 
-# adjustments for using Extension class
-# 1. manifest.xml is expected in root directory
-$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\
-	mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \
-	$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) \
-))
-
 $(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
 
 # vim: set noet sw=4 ts=4:

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))