diff options
author | David Tardon <dtardon@redhat.com> | 2012-05-04 16:34:21 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-04 16:45:35 +0200 |
commit | 9694abe2b6c8525856a316a08a3ebe9d4bb600b5 (patch) | |
tree | 838a604425b24f9e1130e87950681b6b29ca817b /solenv/gbuild/Extension.mk | |
parent | fdo#49136 install description-*.txt (diff) | |
download | core-9694abe2b6c8525856a316a08a3ebe9d4bb600b5.tar.gz core-9694abe2b6c8525856a316a08a3ebe9d4bb600b5.zip |
do not handle description-* as special case
Diffstat (limited to 'solenv/gbuild/Extension.mk')
-rw-r--r-- | solenv/gbuild/Extension.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index aaa35a17fee2..3de3af9ce09c 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -98,8 +98,7 @@ $(call gb_Extension_get_target,%) : \ cd $(call gb_Extension_get_rootdir,$*) && \ $(gb_Extension_ZIPCOMMAND) -rX --filesync \ $(call gb_Extension_get_target,$*) \ - $(FILES) \ - $(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt)) + $(FILES)) # TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) once readlicense_oo will be gbuildized # or just another simpler solution @@ -115,6 +114,7 @@ $(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 ifneq ($(strip $(gb_WITH_LANG)),) +$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt) $(call gb_Extension_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf $(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF) endif |