diff options
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 | ||||
| -rw-r--r-- | sysui/Module_sysui.mk | 2 | ||||
| -rw-r--r-- | sysui/Package_osxicons.mk (renamed from sysui/Zip_osxicons.mk) | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index bd5b571c3fb1..b5fe2a29d20f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1267,10 +1267,10 @@ End #ifdef MACOSX File gid_File_Icns_Bundle - ARCHIVE_TXT_FILE_BODY; - Dir = gid_Dir_Bundle_Contents_Resources; - Name = "osxicons.zip"; - Styles = (ARCHIVE); + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "sysui_osxicons.filelist"; End #endif 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 \ |