Fix ENV value for NetBSD
authorfujiwarat <takao.fujiwara1@gmail.com>
Tue, 26 Oct 2010 02:45:29 +0000 (11:45 +0900)
committerPeng Huang <shawn.p.huang@gmail.com>
Tue, 26 Oct 2010 03:03:14 +0000 (12:03 +0900)
bus/Makefile.am
configure.ac
setup/Makefile.am

index 5685562..764edc7 100644 (file)
@@ -143,6 +143,6 @@ $(libibus):
        $(MAKE) -C $(top_builddir)/src
 
 test: ibus-daemon
-       $(ENV) \
+       $(ENV_IBUS_TEST) \
                G_DEBUG=fatal_warnings \
                $(builddir)/ibus-daemon -v
index aa78b23..4f64cb6 100644 (file)
@@ -228,8 +228,8 @@ AC_ARG_ENABLE(memconf,
 AM_CONDITIONAL([ENABLE_MEMCONF], [test "x$enable_memconf" = "xyes"])
 
 # check env
-AC_PATH_PROG(ENV, env)
-AC_SUBST(ENV)
+AC_PATH_PROG(ENV_IBUS_TEST, env)
+AC_SUBST(ENV_IBUS_TEST)
 
 AC_ARG_ENABLE(python,
     AS_HELP_STRING([--disable-python],
index 0b81bf3..e58e77f 100644 (file)
@@ -57,7 +57,7 @@ DISTCLEANFILES = \
        $(NULL)
 
 test:
-       $(ENV) \
+       $(ENV_IBUS_TEST) \
                PYTHONPATH=$(top_srcdir) \
                IBUS_PREFIX="@prefix@" \
                IBUS_LOCALEDIR="@localedir@" \