From 050c84ea5a7ba1dc19de34ee28ef02d00b7d0ad0 Mon Sep 17 00:00:00 2001 From: Choe Hwanjin Date: Fri, 10 Feb 2012 23:02:49 +0900 Subject: [PATCH] Install icons to hicolor icon theme directory This makes ibus-hangul's icons themable. --- icons/Makefile.am | 10 +++++++--- setup/Makefile.am | 6 ++++++ src/hangul.xml.in.in | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/icons/Makefile.am b/icons/Makefile.am index 638af49..2414f13 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -23,10 +23,14 @@ icons_DATA = \ ibus-hangul.png \ ibus-hangul.svg \ $(NULL) - iconsdir = $(pkgdatadir)/icons +hicolor_icon_64_DATA = ibus-hangul.png +hicolor_icon_64dir = $(datadir)/icons/hicolor/64x64/apps + +hicolor_icon_scalable_DATA = ibus-hangul.svg +hicolor_icon_scalabledir = $(datadir)/icons/hicolor/scalable/apps + EXTRA_DIST = \ - ibus-hangul.png \ - ibus-hangul.svg \ + $(icon_DATA) \ $(NULL) diff --git a/setup/Makefile.am b/setup/Makefile.am index eedb507..f0fd9b3 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -43,6 +43,12 @@ desktop_DATA = ibus-setup-hangul.desktop desktopdir = $(datadir)/applications @INTLTOOL_DESKTOP_RULE@ +hicolor_icon_64_DATA = ibus-setup-hangul.png +hicolor_icon_64dir = $(datadir)/icons/hicolor/64x64/apps + +hicolor_icon_scalable_DATA = ibus-setup-hangul.svg +hicolor_icon_scalabledir = $(datadir)/icons/hicolor/scalable/apps + CLEANFILES = \ ibus-setup-hangul \ config.py \ diff --git a/src/hangul.xml.in.in b/src/hangul.xml.in.in index a87df59..c634d62 100644 --- a/src/hangul.xml.in.in +++ b/src/hangul.xml.in.in @@ -16,7 +16,7 @@ ko GPL Peng Huang <shawn.p.huang@gmail.com> - ${pkgdatadir}/icons/ibus-hangul.png + ibus-hangul us Korean Korean Input Method -- 2.7.4