From 525084f34c4b0b81ac1904a8b7fc53b857fed705 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <takao.fujiwara1@gmail.com>
Date: Wed, 21 Aug 2013 10:49:33 -0400
Subject: Fix ENV value for NetBSD

BUG=http://code.google.com/p/ibus/issues/detail?id=1649
R=Shawn.P.Huang@gmail.com

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

Patch from Takao Fujiwara <takao.fujiwara1@gmail.com>.
---
 configure.ac      | 4 ++--
 setup/Makefile.am | 4 ++--
 src/Makefile.am   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9802310..aa6242a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,8 +78,8 @@ CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
 
 # check env
-AC_PATH_PROG(ENV, env)
-AC_SUBST(ENV)
+AC_PATH_PROG(ENV_IBUS_TEST, env)
+AC_SUBST(ENV_IBUS_TEST)
 
 # check python
 AM_PATH_PYTHON([2.5])
diff --git a/setup/Makefile.am b/setup/Makefile.am
index e781acf..ac36464 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -37,13 +37,13 @@ EXTRA_DIST = \
 	$(NULL)
 
 test-pinyin:
-	$(ENV) DBUS_DEBUG=true \
+	$(ENV_IBUS_TEST) DBUS_DEBUG=true \
 		   IBUS_LOCALEDIR=@localedir@ \
 		   PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \
 		   $(PYTHON) $(srcdir)/main.py pinyin
 
 test-bopomofo:
-	$(ENV) DBUS_DEBUG=true \
+	$(ENV_IBUS_TEST) DBUS_DEBUG=true \
 		   IBUS_LOCALEDIR=@localedir@ \
 		   PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \
 		   $(PYTHON) $(srcdir)/main.py bopomofo
diff --git a/src/Makefile.am b/src/Makefile.am
index cd80bb2..61f6a02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,10 +193,10 @@ pinyin.xml: pinyin.xml.in
 	) > $@
 
 test: ibus-engine-pinyin
-	$(ENV) \
+	$(ENV_IBUS_TEST) \
 		G_DEBUG=fatal_criticals \
 		$(builddir)/ibus-engine-pinyin
 
 # test: ibus-engine-pinyin
-# 	$(ENV) G_DEBUG=fatal_warnings \
+# 	$(ENV_IBUS_TEST) G_DEBUG=fatal_warnings \
 # 	$(builddir)/ibus-engine-pinyin
-- 
cgit v1.2.1