From 51ff84e0ffce0eb72dd093a890dd4f4cfdbc6c61 Mon Sep 17 00:00:00 2001 From: fujiwarat Date: Thu, 26 Mar 2015 18:16:16 +0900 Subject: Added textdomain in default.xml --- engine/python2/Makefile.am | 24 +++++++----------------- engine/python2/anthy.xml.in.in | 10 +++++----- engine/python2/default.xml.in.in | 5 +++-- engine/python3/Makefile.am | 24 +++++++----------------- engine/python3/anthy.xml.in.in | 10 +++++----- engine/python3/default.xml.in.in | 5 +++-- 6 files changed, 30 insertions(+), 48 deletions(-) (limited to 'engine') diff --git a/engine/python2/Makefile.am b/engine/python2/Makefile.am index a96f831..afc9236 100644 --- a/engine/python2/Makefile.am +++ b/engine/python2/Makefile.am @@ -3,8 +3,8 @@ # ibus-anthy - The Anthy engine for IBus # # Copyright (c) 2007-2008 Peng Huang -# Copyright (c) 2010-2013 Takao Fujiwara -# Copyright (c) 2007-2013 Red Hat, Inc. +# Copyright (c) 2010-2015 Takao Fujiwara +# Copyright (c) 2007-2015 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,21 +77,11 @@ componentdir = $(datadir)/ibus/component engine_DATA = default.xml enginedir = $(pkgdatadir)/engine -anthy.xml: anthy.xml.in - ( \ - libexecdir=${libexecdir}; \ - pkgdatadir=${pkgdatadir}; \ - s=`cat $<`; \ - eval "echo \"$${s}\""; \ - ) > $@ - -default.xml: default.xml.in - ( \ - libexecdir=${libexecdir}; \ - pkgdatadir=${pkgdatadir}; \ - s=`cat $<`; \ - eval "echo \"$${s}\""; \ - ) > $@ +%.xml: %.xml.in + sed -e "s|\@libexecdir\@|$(libexecdir)|g" \ + -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \ + -e "s|_description|description|g" \ + $< > $@ _config.py: _config.py.in ( \ diff --git a/engine/python2/anthy.xml.in.in b/engine/python2/anthy.xml.in.in index 9a93744..66212cb 100644 --- a/engine/python2/anthy.xml.in.in +++ b/engine/python2/anthy.xml.in.in @@ -1,10 +1,10 @@ - + org.freedesktop.IBus.Anthy Anthy Component - ${libexecdir}/ibus-engine-anthy --ibus - @VERSION@ + @libexecdir@/ibus-engine-anthy --ibus + @PACKAGE_VERSION@ Peng Huang <shawn.p.huang@gmail.com> GPL http://code.google.com/p/ibus @@ -13,7 +13,7 @@ ~/.config/ibus-anthy/engines.xml - ${pkgdatadir}/engine/default.xml + @pkgdatadir@/engine/default.xml - + diff --git a/engine/python2/default.xml.in.in b/engine/python2/default.xml.in.in index 27e3c82..3ae5a62 100644 --- a/engine/python2/default.xml.in.in +++ b/engine/python2/default.xml.in.in @@ -1,4 +1,4 @@ - + anthy @@ -10,10 +10,11 @@ Anthy - Anthy Input Method + <_description>Anthy Input Method 99 @HOTKEYS_XML@ @SYMBOL_XML@ @PACKAGE_VERSION@ + ibus-anthy diff --git a/engine/python3/Makefile.am b/engine/python3/Makefile.am index a96f831..afc9236 100644 --- a/engine/python3/Makefile.am +++ b/engine/python3/Makefile.am @@ -3,8 +3,8 @@ # ibus-anthy - The Anthy engine for IBus # # Copyright (c) 2007-2008 Peng Huang -# Copyright (c) 2010-2013 Takao Fujiwara -# Copyright (c) 2007-2013 Red Hat, Inc. +# Copyright (c) 2010-2015 Takao Fujiwara +# Copyright (c) 2007-2015 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,21 +77,11 @@ componentdir = $(datadir)/ibus/component engine_DATA = default.xml enginedir = $(pkgdatadir)/engine -anthy.xml: anthy.xml.in - ( \ - libexecdir=${libexecdir}; \ - pkgdatadir=${pkgdatadir}; \ - s=`cat $<`; \ - eval "echo \"$${s}\""; \ - ) > $@ - -default.xml: default.xml.in - ( \ - libexecdir=${libexecdir}; \ - pkgdatadir=${pkgdatadir}; \ - s=`cat $<`; \ - eval "echo \"$${s}\""; \ - ) > $@ +%.xml: %.xml.in + sed -e "s|\@libexecdir\@|$(libexecdir)|g" \ + -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \ + -e "s|_description|description|g" \ + $< > $@ _config.py: _config.py.in ( \ diff --git a/engine/python3/anthy.xml.in.in b/engine/python3/anthy.xml.in.in index 9a93744..66212cb 100644 --- a/engine/python3/anthy.xml.in.in +++ b/engine/python3/anthy.xml.in.in @@ -1,10 +1,10 @@ - + org.freedesktop.IBus.Anthy Anthy Component - ${libexecdir}/ibus-engine-anthy --ibus - @VERSION@ + @libexecdir@/ibus-engine-anthy --ibus + @PACKAGE_VERSION@ Peng Huang <shawn.p.huang@gmail.com> GPL http://code.google.com/p/ibus @@ -13,7 +13,7 @@ ~/.config/ibus-anthy/engines.xml - ${pkgdatadir}/engine/default.xml + @pkgdatadir@/engine/default.xml - + diff --git a/engine/python3/default.xml.in.in b/engine/python3/default.xml.in.in index 27e3c82..3ae5a62 100644 --- a/engine/python3/default.xml.in.in +++ b/engine/python3/default.xml.in.in @@ -1,4 +1,4 @@ - + anthy @@ -10,10 +10,11 @@ Anthy - Anthy Input Method + <_description>Anthy Input Method 99 @HOTKEYS_XML@ @SYMBOL_XML@ @PACKAGE_VERSION@ + ibus-anthy -- cgit v1.2.1