Fix problem in archlinux.

diff --git a/configure.ac b/configure.ac
index 8e4831b..2c04a25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,6 @@ m4/Makefile
 ])
 
 AC_OUTPUT
-
 AC_MSG_RESULT([
 Build options:
   Version                  $VERSION

diff --git a/launcher/ibus.in b/launcher/ibus.in
index 9db50d7..0191988 100644 (file)
--- a/launcher/ibus.in
+++ b/launcher/ibus.in
@@ -29,15 +29,18 @@ import ibus
 import dbus
 import signal
 
-daemon = "@prefix@/libexec/ibus-daemon"
-x11 = "@prefix@/libexec/ibus-x11"
-panel = "@prefix@/libexec/ibus-panel"
-conf = "@prefix@/libexec/ibus-gconf"
+prefix = "@prefix@"
+exec_prefix = "@exec_prefix@".replace("${prefix}", prefix)
+libexecdir = "@libexecdir@".replace("${exec_prefix}", exec_prefix)
 
+daemon = "%s/ibus-daemon" % libexecdir
+x11 = "%s/ibus-x11" % libexecdir
+panel = "%s/ibus-panel" % libexecdir
+conf = "%s/ibus-gconf" % libexecdir
 
-class IBusLauncher(object):
+class Launcher(object):
     def __init__(self):
-        super(IBusLauncher, self).__init__()
+        super(Launcher, self).__init__()
         self.__daemon_pid = 0
         self.__panel_pid = 0
         self.__x11_pid = 0
@@ -120,4 +123,4 @@ class IBusLauncher(object):
         ibus.main()
 
 if __name__ == "__main__":
-    IBusLauncher().run()
+    Launcher().run()