From d89313116374fb647df89cba0aee8002a0750308 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Fri, 27 May 2011 10:47:13 -0400
Subject: [PATCH] Fix make distcheck errors.

BUG=make distcheck failed
TEST=Manually

Review URL: http://codereview.appspot.com/4551054
---
 configure.ac                    |  8 ++++----
 data/Makefile.am                | 20 +++++++++++++-------
 data/db/android/Makefile.am     |  2 +-
 data/db/open-phrase/Makefile.am |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8ffdd29..358d818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,12 +95,12 @@ AC_SUBST(ENV)
 # check python
 AM_PATH_PYTHON([2.5])
 
-# --disble-boost
+# --enable-boost
 AC_ARG_ENABLE(boost,
-    AC_HELP_STRING([--disable-boost],
-        [Do not use boost and use stdc++0x to replace boost.]),
+    AC_HELP_STRING([--enable-boost],
+        [Use boost to replace stdc++0x.]),
         [enable_boost=$enableval],
-        [enable_boost=yes]
+        [enable_boost=no]
 )
 if test x"$enable_boost" = x"yes"; then
     # check boost
diff --git a/data/Makefile.am b/data/Makefile.am
index 02e8feb..6025de3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,16 +27,22 @@ SUBDIRS = \
 	icons \
 	$(NULL)
 
+english_db_DATA = \
+        $(ENGLISH_DB) \
+        $(NULL)
+english_dbdir = $(pkgdatadir)/db
+
+$(ENGLISH_DB): $(WORDLIST) $(ENGLISH_AWK)
+	$(AM_V_GEN) \
+	$(RM) $@; \
+	$(AWK) -f $(srcdir)/$(ENGLISH_AWK) $(srcdir)/$(WORDLIST) | @SQLITE3@ $@ || \
+		( $(RM) $@ ; exit 1 )
 
 EXTRA_DIST = \
 	$(WORDLIST) \
 	$(ENGLISH_AWK) \
 	$(NULL)
 
-english_db_DATA = \
-        $(ENGLISH_DB) \
-        $(NULL)
-english_dbdir = $(pkgdatadir)/db
-
-$(ENGLISH_DB): $(WORDLIST)
-	$(AWK) -f english.awk $< |sqlite3 $@
+CLEANFILES = \
+	$(ENGLISH_DB) \
+	$(NULL)
diff --git a/data/db/android/Makefile.am b/data/db/android/Makefile.am
index 7574596..d36546c 100644
--- a/data/db/android/Makefile.am
+++ b/data/db/android/Makefile.am
@@ -48,7 +48,7 @@ EXTRA_DIST = \
 	$(NULL)
 
 CLEANFILES = \
-	android.db \
+	$(main_db_DATA) \
 	$(NULL)
 
 DISTCLEANFILES = \
diff --git a/data/db/open-phrase/Makefile.am b/data/db/open-phrase/Makefile.am
index f343ec5..c77b0a2 100644
--- a/data/db/open-phrase/Makefile.am
+++ b/data/db/open-phrase/Makefile.am
@@ -31,7 +31,7 @@ DBTAR = pinyin-database-$(DBVER).tar.bz2
 
 $(DBTAR):
 	$(AM_V_GEN) \
-	wget http://ibus.googlecode.com/files/$(DBTAR) && \
+	wget http://ibus.googlecode.com/files/$(DBTAR) || \
 	( $(RM) $@; exit 1)
 
 stamp-db: $(DBTAR)
-- 
2.7.4