diff --git a/configure.ac b/configure.ac index a2087a3dd..047b05d88 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 c0cd88989..061cd6839 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 e399230d6..0644d7e95 100644 --- a/gconf/gconf.xml.in +++ b/gconf/gconf.xml.in.in @@ -3,7 +3,7 @@ org.freedesktop.IBus.Config GConf Config Component - @prefix@/libexec/ibus-gconf + ${libexecdir}/ibus-gconf @VERSION@ Peng Huang <shawn.p.huang@gmail.com> GPL diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index e80cf96ac..edaf4ec2f 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 961dc5af3..7e5d91dc3 100644 --- a/ui/gtk/gtkpanel.xml.in +++ b/ui/gtk/gtkpanel.xml.in.in @@ -3,7 +3,7 @@ org.freedesktop.IBus.Panel Gtk Panel Component - @prefix@/libexec/ibus-ui-gtk + ${libexecdir}/ibus-ui-gtk @VERSION@ Peng Huang <shawn.p.huang@gmail.com> GPL