diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-06 09:47:33 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-06 09:47:33 +0800 |
| commit | 194feaf505333003664e8f7d134d25069fcbb3a3 (patch) | |
| tree | 8ff8c295a51af9038e4457b7f415a2d47e3664ef | |
| parent | 5fc311c8a1195afca7a29006f8d3e785b35c6b00 (diff) | |
| download | ibus-anthy-194feaf505333003664e8f7d134d25069fcbb3a3.tar.gz | |
Fix problem when generate anthy.xml
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | engine/Makefile.am | 11 | ||||
| -rw-r--r-- | engine/anthy.xml.in.in (renamed from engine/anthy.xml.in) | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 34b93f4..8b57163 100644 --- a/configure.ac +++ b/configure.ac @@ -97,7 +97,7 @@ Makefile ibus-anthy.spec engine/Makefile engine/ibus-engine-anthy -engine/anthy.xml +engine/anthy.xml.in icons/Makefile m4/Makefile ]) diff --git a/engine/Makefile.am b/engine/Makefile.am index 6f45a2b..78f293b 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -62,6 +62,14 @@ enginedir = $(datadir)/ibus/component anthy.py anthy_wrap.c: anthy.i $(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i +anthy.xml: anthy.xml.in + ( \ + libexecdir=${libexecdir}; \ + pkgdatadir=${pkgdatadir}; \ + s=`cat $<`; \ + eval "echo \"$${s}\""; \ + ) > $@ + test: $(ENV) \ DBUS_DEBUG=true \ @@ -72,11 +80,12 @@ test: EXTRA_DIST = \ anthy.i \ - anthy.xml.in \ + anthy.xml.in.in \ ibus-engine-anthy.in \ $(NULL) CLEANFILES = \ + anthy.xml \ anthy.py \ anthy_wrap.* \ *.pyc \ diff --git a/engine/anthy.xml.in b/engine/anthy.xml.in.in index 2aa1e2c..abe8fc0 100644 --- a/engine/anthy.xml.in +++ b/engine/anthy.xml.in.in @@ -3,7 +3,7 @@ <component> <name>org.freedesktop.IBus.Anthy</name> <description>Anthy Component</description> - <exec>@prefix@/libexec/ibus-engine-anthy --ibus</exec> + <exec>${libexecdir}/ibus-engine-anthy --ibus</exec> <version>@VERSION@</version> <author>Peng Huang <shawn.p.huang@gmail.com></author> <license>GPL</license> @@ -17,7 +17,7 @@ <language>ja</language> <license>GPL</license> <author>Peng Huang <shawn.p.huang@gmail.com></author> - <icon>@prefix@/share/ibus-anthy/icons/ibus-anthy.png</icon> + <icon>${pkgdatadir}/icons/ibus-anthy.png</icon> <layout>us</layout> <longname>Anthy</longname> <description>Anthy Input Method</description> |