summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2008-08-13 15:15:09 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2008-08-13 15:15:09 +0800
commit1b0b4528869fe3b1a46e49a38385226dba228491 (patch)
tree560b0d41745efcbb9befed34f603287b0e849643 /setup
parent9e2c9217c60ca9c58b5071ec8a0da1a4abfef2d5 (diff)
downloadibus-1b0b4528869fe3b1a46e49a38385226dba228491.tar.gz
ibus-1b0b4528869fe3b1a46e49a38385226dba228491.tar.xz
ibus-1b0b4528869fe3b1a46e49a38385226dba228491.zip
Use libexecdir
Diffstat (limited to 'setup')
-rw-r--r--setup/ibus-setup.in3
-rw-r--r--setup/main.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
index 936c281..d08e8b6 100644
--- a/setup/ibus-setup.in
+++ b/setup/ibus-setup.in
@@ -19,6 +19,9 @@
# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307 USA
+prefix=@prefix@
+exec_prefix=@exec_prefix@
export IBUS_PREFIX=@prefix@
+export IBUS_LIBEXECDIR=@libexecdir@
exec python @prefix@/share/ibus/setup/main.py $@
diff --git a/setup/main.py b/setup/main.py
index 2e11c98..aa8eee4 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -289,7 +289,7 @@ class Setup(object):
def __is_auto_start(self):
link_file = path.join(BaseDirectory.xdg_config_home, "autostart/ibus.desktop")
- ibus_desktop = path.join(os.getenv("IBUS_PREFIX"), "share/applications/ibus.desktop")
+ ibus_desktop = path.join(os.getenv("IBUS_LIBEXECDIR"), "share/applications/ibus.desktop")
if not path.exists(link_file):
return False