summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2009-02-06 09:32:50 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2009-02-06 09:32:50 +0800
commit142d69b5ff54f203bc29a3e439061a3d4726c120 (patch)
tree962568d90b6bcf20aca9766445f339029ee4c4de /ui
parent0bcd2dd9d08f2ac57121c283a63180f92a735338 (diff)
downloadibus-142d69b5ff54f203bc29a3e439061a3d4726c120.tar.gz
ibus-142d69b5ff54f203bc29a3e439061a3d4726c120.tar.xz
ibus-142d69b5ff54f203bc29a3e439061a3d4726c120.zip
Fix issue http://code.google.com/p/ibus/issues/detail?id=241.
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/Makefile.am10
-rw-r--r--ui/gtk/gtkpanel.xml.in.in (renamed from ui/gtk/gtkpanel.xml.in)2
2 files changed, 10 insertions, 2 deletions
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index e80cf96..edaf4ec 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -43,14 +43,22 @@ component_DATA = \
componentdir = $(pkgdatadir)/component
CLEANFILES = \
+ gtkpanel.xml \
*.pyc \
$(NULL)
EXTRA_DIST = \
ibus-ui-gtk.in \
- gtkpanel.xml.in \
+ gtkpanel.xml.in.in \
$(NULL)
+gtkpanel.xml: gtkpanel.xml.in
+ ( \
+ libexecdir=${libexecdir}; \
+ s=`cat $<`; \
+ eval "echo \"$${s}\""; \
+ ) > $@
+
test:
$(ENV) DBUS_DEBUG=true \
IBUS_PREFIX=@prefix@ \
diff --git a/ui/gtk/gtkpanel.xml.in b/ui/gtk/gtkpanel.xml.in.in
index 961dc5a..7e5d91d 100644
--- a/ui/gtk/gtkpanel.xml.in
+++ b/ui/gtk/gtkpanel.xml.in.in
@@ -3,7 +3,7 @@
<component>
<name>org.freedesktop.IBus.Panel</name>
<description>Gtk Panel Component</description>
- <exec>@prefix@/libexec/ibus-ui-gtk</exec>
+ <exec>${libexecdir}/ibus-ui-gtk</exec>
<version>@VERSION@</version>
<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
<license>GPL</license>