diff options
| author | Choe Hwanjin <choe.hwanjin@gmail.com> | 2013-01-13 01:33:22 +0900 |
|---|---|---|
| committer | Choe Hwanjin <choe.hwanjin@gmail.com> | 2013-01-13 01:33:22 +0900 |
| commit | cc82ea1221847499e62b4b6b7a0bffc30b2e9ecb (patch) | |
| tree | 72a3d1f2bfdb2f5ea4b90216a95257e3b43ba7c7 | |
| parent | afa0ce2953e8d64ae88f956f3657e6faf1e3c44d (diff) | |
| download | ibus-hangul-cc82ea1221847499e62b4b6b7a0bffc30b2e9ecb.tar.gz | |
Don't use ENV variable in Makefile (NetBSD problem)
NetBSD uses ENV variable for shell option.
So our makefile should not override ENV variable.
We use ENV_PROG instead
Issue: http://code.google.com/p/ibus/issues/detail?id=1029
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | setup/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 39ccbd5..a18dde4 100644 --- a/configure.ac +++ b/configure.ac @@ -63,8 +63,8 @@ PKG_CHECK_MODULES(HANGUL, [ ]) # check env -AC_PATH_PROG(ENV, env) -AC_SUBST(ENV) +AC_PATH_PROG(ENV_PROG, env) +AC_SUBST(ENV_PROG) #check python AM_PATH_PYTHON([2.5]) diff --git a/setup/Makefile.am b/setup/Makefile.am index 937a30a..4f52178 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST = \ $(NULL) test: - $(ENV) DBUS_DEBUG=true \ + $(ENV_PROG) DBUS_DEBUG=true \ PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \ $(PYTHON) $(srcdir)/main.py |