Fix problem when generate pinyin.xml

diff --git a/configure.ac b/configure.ac
index 4ed9560..0e8d0e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ Makefile
 ibus-pinyin.spec
 engine/Makefile
 engine/ibus-engine-pinyin
-engine/pinyin.xml
+engine/pinyin.xml.in
 setup/Makefile
 setup/ibus-setup-pinyin
 icons/Makefile

diff --git a/engine/Makefile.am b/engine/Makefile.am
index 6c78242..aaae759 100644 (file)
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -59,11 +59,20 @@ EXTRA_DIST = \
        $(NULL)
 
 CLEANFILES = \
+       pinyin.xml \
        *.pyc \
        py.db \
        $(DBTAR) \
        $(NULL)
 
+pinyin.xml: pinyin.xml.in
+       ( \
+               libexecdir=${libexecdir}; \
+               pkgdatadir=${pkgdatadir}; \
+               s=`cat $<`; \
+               eval "echo \"$${s}\""; \
+       ) > $@
+
 test:
        $(ENV) \
                IBUS_PINYIN_LOCATION=$(abs_top_srcdir) \

diff --git a/engine/pinyin.xml.in b/engine/pinyin.xml.in.in
similarity index 85%
rename from engine/pinyin.xml.in
rename to engine/pinyin.xml.in.in
index de2f2e8..39f04d7 100644 (file)
--- a/engine/pinyin.xml.in
+++ b/engine/pinyin.xml.in.in
@@ -3,7 +3,7 @@
 <component>
        <name>org.freedesktop.IBus.PinYin</name>
        <description>PinYin Component</description>
-       <exec>@prefix@/libexec/ibus-engine-pinyin --ibus</exec>
+       <exec>${libexecdir}/ibus-engine-pinyin --ibus</exec>
        <version>@VERSION@</version>
        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
        <license>GPL</license>
@@ -17,7 +17,7 @@
                        <language>zh_CN</language>
                        <license>GPL</license>
                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                       <icon>@prefix@/share/ibus-pinyin/icons/ibus-pinyin.svg</icon>
+                       <icon>${pkgdatadir}/icons/ibus-pinyin.svg</icon>
                        <layout>us</layout>
                        <longname>PinYin</longname>
                        <description>PinYin Input Method</description>

diff --git a/po/ja.po b/po/ja.po
index 38a5302..9d94abf 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 15:57+0800\n"
+"POT-Creation-Date: 2009-01-25 15:21+0800\n"
 "PO-Revision-Date: 2008-08-28 19:19+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0cd6bd2..c6f5814 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 15:57+0800\n"
+"POT-Creation-Date: 2009-01-25 15:21+0800\n"
 "PO-Revision-Date: 2008-08-13 22:52+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"