summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-04-17 21:28:40 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-18 03:59:51 +0000
commit0b4315077a6827798e1d2bdae73298365ba9a018 (patch)
tree957f20fc7ca8089d7acad9aea72ea986ffbc59d8 /sysui
parentd461088eb4dd3b3bf7c2caaab082890ebcf80fea (diff)
fdo#63197, convert sysui osxicons
Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24 Reviewed-on: https://gerrit.libreoffice.org/3440 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/Module_sysui.mk2
-rw-r--r--sysui/Package_osxicons.mk (renamed from sysui/Zip_osxicons.mk)6
2 files changed, 5 insertions, 3 deletions
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 9c5c76a51c06..c668730e9895 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,sysui,\
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,sysui,\
- Zip_osxicons \
+ Package_osxicons \
CustomTarget_infoplist \
Package_infoplist \
))
diff --git a/sysui/Zip_osxicons.mk b/sysui/Package_osxicons.mk
index d9c19019df0b..ed84e100cd80 100644
--- a/sysui/Zip_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -7,9 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
-$(eval $(call gb_Zip_add_files,osxicons,\
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
icons/text.icns \
icons/oasis-text.icns \
icons/spreadsheet.icns \