diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 21:43:41 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:36 +0100 |
commit | 3df5304ada4cec75072bc71f24ab82fe9b48d97c (patch) | |
tree | 99dba5737b1718643a31c067a0023024cda33275 /sysui | |
parent | 5de3b85f17d90e535f963313b4a645b28dacba33 (diff) |
sysui: remove Package_icons
- rename main_app.ico to soffice.ico (in case the name is relevant?)
- installer: hard-code path to sysui/desktop/icons/soffice.ico
Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/Module_sysui.mk | 5 | ||||
-rw-r--r-- | sysui/Package_icons.mk | 16 | ||||
-rw-r--r-- | sysui/desktop/icons/soffice.ico (renamed from sysui/desktop/icons/main_app.ico) | bin | 35123 -> 35123 bytes |
3 files changed, 0 insertions, 21 deletions
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk index 9744ba864130..99ea359348e2 100644 --- a/sysui/Module_sysui.mk +++ b/sysui/Module_sysui.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) - else # OS=MACOSX $(eval $(call gb_Module_add_targets,sysui,\ Package_osxicons \ @@ -27,10 +26,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ Package_infoplist \ )) endif -else # OS=WNT -$(eval $(call gb_Module_add_targets,sysui,\ - Package_icons \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk deleted file mode 100644 index e4d60c94f159..000000000000 --- a/sysui/Package_icons.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,sysui/icons,$(SRCDIR)/sysui/desktop/icons)) - -$(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) - -# vim: set noet sw=4 ts=4: diff --git a/sysui/desktop/icons/main_app.ico b/sysui/desktop/icons/soffice.ico Binary files differindex ec11e8fe579a..ec11e8fe579a 100644 --- a/sysui/desktop/icons/main_app.ico +++ b/sysui/desktop/icons/soffice.ico |