Simplify component xml generation using sed

BUG=none

Review URL: https://codereview.appspot.com/7445048

6 files changed, 21 insertions, 27 deletions

diff --git a/conf/dconf/Makefile.am b/conf/dconf/Makefile.am
index f0e24b0a..48dd0ce0 100644
--- a/conf/dconf/Makefile.am
+++ b/conf/dconf/Makefile.am
@@ -66,16 +66,14 @@ DISTCLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	dconf.xml.in.in \
+	dconf.xml.in \
 	$(NULL)
 
 dconf.xml: dconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in
index ceb2b0c6..4e546a97 100644
--- a/conf/dconf/dconf.xml.in.in
+++ b/conf/dconf/dconf.xml.in
@@ -1,9 +1,9 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: dconf.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>Dconf Config Component</description>
-	<exec>${libexecdir}/ibus-dconf</exec>
+	<exec>@libexecdir@/ibus-dconf</exec>
 	<version>@VERSION@</version>
 	<author>Daiki Ueno &lt;ueno@unixuser.org&gt;</author>
 	<license>GPL</license>
diff --git a/conf/gconf/Makefile.am b/conf/gconf/Makefile.am
index cf74a4ab..40cde900 100644
--- a/conf/gconf/Makefile.am
+++ b/conf/gconf/Makefile.am
@@ -62,16 +62,14 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	gconf.xml.in.in \
+	gconf.xml.in \
 	$(NULL)
 
 gconf.xml: gconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in
index d82179f3..96d12f39 100644
--- a/conf/gconf/gconf.xml.in.in
+++ b/conf/gconf/gconf.xml.in
@@ -1,9 +1,9 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: pinyin.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>GConf Config Component</description>
-	<exec>${libexecdir}/ibus-gconf</exec>
+	<exec>@libexecdir@/ibus-gconf</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index 5837e661..ebaf76e4 100644
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -67,16 +67,14 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	memconf.xml.in.in \
+	memconf.xml.in \
 	$(NULL)
 
 memconf.xml: memconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in
index 939e40af..b6fdacf3 100644
--- a/conf/memconf/memconf.xml.in.in
+++ b/conf/memconf/memconf.xml.in
@@ -1,8 +1,8 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>On-memory Config Component</description>
-	<exec>${libexecdir}/ibus-memconf</exec>
+	<exec>@libexecdir@/ibus-memconf</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;, modified by the Chromium OS Authors</author>
 	<license>GPL</license>