diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-07 09:30:12 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-07 09:30:12 +0800 |
| commit | 5e3b0338afb3e16e6cb0a299108fa478d0aa3a58 (patch) | |
| tree | 09284d511a4b0116fa1513f9f20b2950ca99c148 | |
| parent | 7f4dbd0a16bfc4bb56dbf31eaa38efd96bb5f26e (diff) | |
| download | ibus-hangul-5e3b0338afb3e16e6cb0a299108fa478d0aa3a58.tar.gz | |
Change some env names.
| -rw-r--r-- | engine/Makefile.am | 2 | ||||
| -rw-r--r-- | engine/factory.py | 3 | ||||
| -rw-r--r-- | engine/ibus-engine-anthy.in | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/engine/Makefile.am b/engine/Makefile.am index 26c1bb2..0f64194 100644 --- 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) IBUS_ANTHY_LOCATION=$(abs_top_srcdir) PYTHONPATH=$(builddir)/.libs $(PYTHON) $(srcdir)/main.py + $(ENV) IBUS_ANTHY_PKGDATADIR=$(abs_top_srcdir) PYTHONPATH=$(builddir)/.libs $(PYTHON) $(srcdir)/main.py EXTRA_DIST = \ anthy.i \ diff --git a/engine/factory.py b/engine/factory.py index 7214184..30c388a 100644 --- a/engine/factory.py +++ b/engine/factory.py @@ -20,6 +20,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import os +from os import path import ibus import engine @@ -29,7 +30,7 @@ ENGINE_PATH = "/com/redhat/IBus/engines/Anthy/Engine/" class EngineFactory(ibus.EngineFactoryBase): NAME = "Anthy" LANG = "ja" - ICON = os.getenv("IBUS_ANTHY_LOCATION") + "/icons/ibus-anthy.png" + ICON = path.join(os.getenv("IBUS_ANTHY_PKGDATADIR"), "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 5039933..6e15825 100644 --- a/engine/ibus-engine-anthy.in +++ b/engine/ibus-engine-anthy.in @@ -19,6 +19,7 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -export IBUS_ANTHY_LOCATION=@prefix@/share/ibus-anthy +export IBUS_PREFIX=@prefix@ +export IBUS_ANTHY_PKGDATADIR=@prefix@/share/ibus-anthy exec python @prefix@/share/ibus-anthy/main.py $@ |