Fix problem when create hangul.xml.

diff --git a/configure.ac b/configure.ac
index 5f1ad09..1571b29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ AC_CONFIG_FILES([ po/Makefile.in
 Makefile
 ibus-hangul.spec
 src/Makefile
-src/hangul.xml
+src/hangul.xml.in
 icons/Makefile
 m4/Makefile
 ])

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e24b38f..9f5220a 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 16:24+0800\n"
+"POT-Creation-Date: 2009-02-05 16:27+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/Makefile.am b/src/Makefile.am
index 0ab6ca9..4c53925 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,5 +61,17 @@ EXTRA_DIST = \
        hangul.xml.in \
        $(NULL)
 
+CLEANFILES = \
+       hangul.xml \
+       $(NULL)
+
+hangul.xml: hangul.xml.in
+       ( \
+               libexecdir=${libexecdir}; \
+               pkgdatadir=${pkgdatadir}; \
+               s=`cat $<`; \
+               eval "echo \"$${s}\""; \
+       ) > $@
+
 test: ibus-engine-hangul
        $(builddir)/ibus-engine-hangul

diff --git a/src/hangul.xml.in b/src/hangul.xml.in.in
similarity index 84%
rename from src/hangul.xml.in
rename to src/hangul.xml.in.in
index 445a260..b72c5e4 100644 (file)
--- a/src/hangul.xml.in
+++ b/src/hangul.xml.in.in
@@ -3,7 +3,7 @@
 <component>
        <name>org.freedesktop.IBus.Hangul</name>
        <description>Hangul Component</description>
-       <exec>@prefix@/libexec/ibus-engine-hangul --ibus</exec>
+       <exec>${libexecdir}/ibus-engine-hangul --ibus</exec>
        <version>@VERSION@</version>
        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
        <license>GPL</license>
@@ -16,7 +16,7 @@
                        <language>ko</language>
                        <license>GPL</license>
                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                       <icon>@prefix@/share/ibus-hangul/icons/ibus-hangul.png</icon>
+                       <icon>${pkgdatadir}/icons/ibus-hangul.png</icon>
                        <layout>us</layout>
                        <longname>Hangul</longname>
                        <description>Hangul Input Method</description>