From a4b2fe2a8d70f6d5be5a8a8583d701dfc30e1135 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Sat, 7 Aug 2010 11:36:27 +0200 Subject: [PATCH] [build] Install application icons in the system-wide theme The icon to be used for system menus must be installed in the system-wide hicolor theme directory (/usr/share/icons/hicolor). So we install another copy of the folder-sparkleshare icon there. Fixes bgo#626170. --- data/icons/Makefile.am | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 4907c766..178d7cf2 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,8 +1,16 @@ theme = hicolor -themedir = $(pkgdatadir)/icons/$(theme) -hicolordir = $(DESTDIR)$(datadir)/icons/hicolor +system_themedir = $(datadir)/icons/$(theme) +app_themedir = $(pkgdatadir)/icons/$(theme) -theme_icons = \ +system_theme_icons = \ + apps,folder-sparkleshare-16.png \ + apps,folder-sparkleshare-22.png \ + apps,folder-sparkleshare-24.png \ + apps,folder-sparkleshare-256.png \ + apps,folder-sparkleshare-32.png \ + apps,folder-sparkleshare-48.png + +app_theme_icons = \ animations,process-syncing-sparkleshare-24.png \ animations,process-working-22.png \ places,folder-16.png \ @@ -31,15 +39,16 @@ install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ -t "$(theme)" \ -s "$(srcdir)" \ -d "x$(DESTDIR)" \ - -b "$(themedir)" \ -m "$(mkinstalldirs)" \ -x "$(INSTALL_DATA)" install-data-local: - @-$(install_icon_exec) -i $(theme_icons) + @-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons) uninstall-hook: - @-$(install_icon_exec) -u $(theme_icons) + @-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons) MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(wildcard *.png *.svg)