From 142d69b5ff54f203bc29a3e439061a3d4726c120 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Fri, 6 Feb 2009 09:32:50 +0800
Subject: [PATCH] Fix issue http://code.google.com/p/ibus/issues/detail?id=241.

---
 configure.ac                                   |  4 ++--
 gconf/Makefile.am                              | 10 +++++++++-
 gconf/{gconf.xml.in => gconf.xml.in.in}        |  2 +-
 ui/gtk/Makefile.am                             | 10 +++++++++-
 ui/gtk/{gtkpanel.xml.in => gtkpanel.xml.in.in} |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)
 rename gconf/{gconf.xml.in => gconf.xml.in.in} (90%)
 rename ui/gtk/{gtkpanel.xml.in => gtkpanel.xml.in.in} (89%)

diff --git a/configure.ac b/configure.ac
index a2087a3..047b05d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,9 +219,9 @@ ibus/interface/Makefile
 ui/Makefile
 ui/gtk/Makefile
 ui/gtk/ibus-ui-gtk
-ui/gtk/gtkpanel.xml
+ui/gtk/gtkpanel.xml.in
 gconf/Makefile
-gconf/gconf.xml
+gconf/gconf.xml.in
 client/Makefile
 client/gtk2/Makefile
 client/qt4/Makefile
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index c0cd889..061cd68 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -61,12 +61,20 @@ component_DATA = \
 componentdir = $(pkgdatadir)/component
 
 CLEANFILES = \
+	gconf.xml \
 	*.pyc \
 	$(NULL)
 
 EXTRA_DIST = \
-	gconf.xml.in \
+	gconf.xml.in.in \
 	$(NULL)
 
+gconf.xml: gconf.xml.in
+	( \
+		libexecdir=${libexecdir}; \
+		s=`cat $<`; \
+		eval "echo \"$${s}\""; \
+	) > $@
+
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/gconf/gconf.xml.in b/gconf/gconf.xml.in.in
similarity index 90%
rename from gconf/gconf.xml.in
rename to gconf/gconf.xml.in.in
index e399230..0644d7e 100644
--- a/gconf/gconf.xml.in
+++ b/gconf/gconf.xml.in.in
@@ -3,7 +3,7 @@
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>GConf Config Component</description>
-	<exec>@prefix@/libexec/ibus-gconf</exec>
+	<exec>${libexecdir}/ibus-gconf</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
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
similarity index 89%
rename from ui/gtk/gtkpanel.xml.in
rename to 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>
-- 
2.7.4