summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysui/CustomTarget_infoplist.mk8
-rw-r--r--sysui/Package_infoplist.mk7
2 files changed, 6 insertions, 9 deletions
diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk
index f8625c2d1132..c98b8679b261 100644
--- a/sysui/CustomTarget_infoplist.mk
+++ b/sysui/CustomTarget_infoplist.mk
@@ -17,8 +17,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,sysui/infoplist))
$(eval $(call gb_CustomTarget_register_targets,sysui/infoplist,\
PkgInfo \
Info.plist \
- $(foreach lang,en-US $(gb_WITH_LANG),\
- InfoPlist_$(lang).zip InfoPlist_$(lang)/InfoPlist.strings) \
+ $(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+ InfoPlist_$(lang)/InfoPlist.strings) \
))
$(info_WORKDIR)/PkgInfo:
@@ -28,10 +28,6 @@ $(info_WORKDIR)/PkgInfo:
$(info_WORKDIR)/Info.plist: $(info_BUILDDIR)/Info.plist
cp $< $@
-$(info_WORKDIR)/InfoPlist_%.zip: $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
- zip -j $@ $<
-
$(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: \
$(info_WORKDIR)/Info.plist $(info_WORKDIR)/documents.ulf
mkdir -p $(dir $@)
diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index 3f224ae4c157..7712b3e77e4e 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -17,8 +17,9 @@ $(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/C
Info.plist \
))
-$(eval $(call gb_Package_add_files,infoplist,bin,\
- $(foreach lang,en-US $(gb_WITH_LANG),InfoPlist_$(lang).zip) \
-))
+$(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+$(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/$(lang).lproj,\
+ InfoPlist_$(lang)/InfoPlist.strings \
+)))
# vim: set noet sw=4 ts=4: