diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-15 14:09:37 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-15 14:09:37 +0800 |
| commit | 2d8de5944b67c9a23e0383a3073e13e67eca5841 (patch) | |
| tree | 37d75bd51b4eea642f17700975f1abb882131b46 | |
| parent | 1667a8b717889846ac1b11d5894a0d0bfc014867 (diff) | |
| download | ibus-anthy-2d8de5944b67c9a23e0383a3073e13e67eca5841.tar.gz | |
Use more @@.
| -rw-r--r-- | engine/Makefile.am | 6 | ||||
| -rw-r--r-- | engine/anthy.engine.in | 2 | ||||
| -rw-r--r-- | engine/ibus-engine-anthy.in | 7 | ||||
| -rw-r--r-- | ibus-anthy.spec.in | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/engine/Makefile.am b/engine/Makefile.am index e8aabfa..6b3a013 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -59,7 +59,11 @@ anthy.py anthy_wrap.c: anthy.i $(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i test: - $(ENV) IBUS_ANTHY_PKGDATADIR=$(abs_top_srcdir) PYTHONPATH=$(builddir)/.libs $(PYTHON) $(srcdir)/main.py + $(ENV) \ + IBUS_ANTHY_PKGDATADIR=$(abs_top_srcdir) \ + PYTHONPATH=$(builddir)/.libs \ + $(PYTHON) \ + $(srcdir)/main.py EXTRA_DIST = \ anthy.i \ diff --git a/engine/anthy.engine.in b/engine/anthy.engine.in index 693d676..edde898 100644 --- a/engine/anthy.engine.in +++ b/engine/anthy.engine.in @@ -1,6 +1,6 @@ Exec=@prefix@/bin/ibus-engine-anthy Name=anthy Lang=ja -Icon=@prefix@/share/ibus-anthy/icons/ibus-anthy.png +Icon=@prefix@/share/@PACKAGE@/icons/ibus-anthy.png Author=Huang Peng <shawn.p.huang@gmail.com> Credits= diff --git a/engine/ibus-engine-anthy.in b/engine/ibus-engine-anthy.in index 6e15825..8b78525 100644 --- a/engine/ibus-engine-anthy.in +++ b/engine/ibus-engine-anthy.in @@ -18,8 +18,9 @@ # License along with this program; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA - +prefix=@prefix@ +datadir=@datadir@ export IBUS_PREFIX=@prefix@ -export IBUS_ANTHY_PKGDATADIR=@prefix@/share/ibus-anthy -exec python @prefix@/share/ibus-anthy/main.py $@ +export IBUS_ANTHY_PKGDATADIR=@datadir@/@PACKAGE@ +exec python @datadir@/@PACKAGE@/main.py $@ diff --git a/ibus-anthy.spec.in b/ibus-anthy.spec.in index fc795f2..0df0a61 100644 --- a/ibus-anthy.spec.in +++ b/ibus-anthy.spec.in @@ -49,9 +49,9 @@ rm -rf $RPM_BUILD_ROOT # %dir %{python_sitearch}/ibus %{python_sitearch}/anthy.py* %{python_sitearch}/_anthy.so -%dir %{_datadir}/ibus-anthy +%dir %{_datadir}/@PACKAGE@ %{_bindir}/ibus-engine-anthy -%{_datadir}/ibus-anthy/* +%{_datadir}/@PACKAGE@/* %{_datadir}/ibus/engine/anthy.engine %changelog |