Install icons in @prefix@/share/ibus-anthy/icons.

diff --git a/engine/Makefile.am b/engine/Makefile.am
index b635aa4..26c1bb2 100644 (file)
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -60,7 +60,7 @@ anthy.py anthy_wrap.c: anthy.i
        $(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
 
 test:
-       $(ENV) PYTHONPATH=$(builddir)/.libs $(PYTHON) $(srcdir)/main.py
+       $(ENV) IBUS_ANTHY_LOCATION=$(abs_top_srcdir) PYTHONPATH=$(builddir)/.libs $(PYTHON) $(srcdir)/main.py
 
 EXTRA_DIST = \
        anthy.i \

diff --git a/engine/anthy.engine.in b/engine/anthy.engine.in
index 11a1918..d2283c8 100644 (file)
--- a/engine/anthy.engine.in
+++ b/engine/anthy.engine.in
@@ -1,6 +1,6 @@
 Exec=@prefix@/libexec/ibus-engine-anthy
 Name=anthy
 Lang=ja
-Icon=ibus-anthy
+Icon=@prefix@/ibus-anthy/ibus-anthy.png
 Author=Huang Peng <shawn.p.huang@gmail.com>
 Credits=

diff --git a/engine/factory.py b/engine/factory.py
index be0c48f..7214184 100644 (file)
--- a/engine/factory.py
+++ b/engine/factory.py
@@ -19,6 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import os
 import ibus
 import engine
 
@@ -28,7 +29,7 @@ ENGINE_PATH = "/com/redhat/IBus/engines/Anthy/Engine/"
 class EngineFactory(ibus.EngineFactoryBase):
     NAME = "Anthy"
     LANG = "ja"
-    ICON = "ibus-anthy"
+    ICON = os.getenv("IBUS_ANTHY_LOCATION") + "/icons/ibus-anthy.png"
     AUTHORS = "Huang Peng <shawn.p.huang@gmail.com>"
     CREDITS = "GPLv2"
 

diff --git a/engine/ibus-engine-anthy.in b/engine/ibus-engine-anthy.in
index 2477786..5039933 100644 (file)
--- a/engine/ibus-engine-anthy.in
+++ b/engine/ibus-engine-anthy.in
@@ -19,5 +19,6 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+export IBUS_ANTHY_LOCATION=@prefix@/share/ibus-anthy
 exec python @prefix@/share/ibus-anthy/main.py $@
 

diff --git a/icons/Makefile.am b/icons/Makefile.am
index b406579..45b2e54 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -23,7 +23,7 @@ icons_DATA = \
        ibus-anthy.png \
        $(NULL)
 
-iconsdir = $(datadir)/ibus/icons
+iconsdir = $(datadir)/ibus-anthy/icons
 
 EXTRA_DIST = \
        ibus-anthy.png \