diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2014-04-07 15:32:28 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2014-04-07 15:32:28 -0400 |
| commit | ca14ca7764b6fe5567f38286886f5c27cd443629 (patch) | |
| tree | 2b2fcd1fb85f3d952bd55246156e9b0224f5889f /lang | |
| parent | 733cf25bc9ac9fb5960f4eb4a6cbe051e1c1fef4 (diff) | |
| parent | 5cba38f38295337bdd03ab4207865fa6599adcb0 (diff) | |
| download | mongo-ca14ca7764b6fe5567f38286886f5c27cd443629.tar.gz | |
Merge branch 'async' of github.com:wiredtiger/wiredtiger into async
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/java/Makefile.am | 2 | ||||
| -rw-r--r-- | lang/java/wiredtiger.i | 2 | ||||
| -rw-r--r-- | lang/python/Makefile.am | 7 | ||||
| -rw-r--r-- | lang/python/wiredtiger.i | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/lang/java/Makefile.am b/lang/java/Makefile.am index cf47db82732..fed3ae39278 100644 --- a/lang/java/Makefile.am +++ b/lang/java/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(abs_top_builddir) +AM_CPPFLAGS = -I$(top_srcdir) JAVADEST = src/com/wiredtiger/db JAVADESTFULL = $(srcdir)/$(JAVADEST) diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i index 4dbcd70c227..709253f4838 100644 --- a/lang/java/wiredtiger.i +++ b/lang/java/wiredtiger.i @@ -45,7 +45,7 @@ %} %{ -#include "../src/include/wt_internal.h" +#include "src/include/wt_internal.h" /* * Closed handle checking: diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am index 1ca92257fd6..cc7d9507b2e 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -1,6 +1,5 @@ -AM_CPPFLAGS = -I$(abs_top_builddir) - PYSRC = $(top_srcdir)/lang/python +PY_INCLUDE_DIRS = $(top_srcdir) if DEBUG PY_SETUP_DEBUG = -g endif @@ -14,11 +13,11 @@ $(PYSRC)/wiredtiger_wrap.c: $(top_srcdir)/src/include/wiredtiger.in $(PYSRC)/wir mv wiredtiger.py wiredtiger/__init__.py) _wiredtiger.so: $(top_builddir)/libwiredtiger.la $(PYSRC)/wiredtiger_wrap.c - $(PYTHON) $(PYSRC)/setup.py build_ext -b . -t . -f $(PY_SETUP_DEBUG) + $(PYTHON) $(PYSRC)/setup.py build_ext -b . -t . -f $(PY_SETUP_DEBUG) -I $(PY_INCLUDE_DIRS) install-exec-local: $(PYTHON) $(PYSRC)/setup.py build_py -d build - $(PYTHON) $(PYSRC)/setup.py build_ext -b build -t . -f $(PY_SETUP_DEBUG) + $(PYTHON) $(PYSRC)/setup.py build_ext -b build -t . -f $(PY_SETUP_DEBUG) -I $(PY_INCLUDE_DIRS) $(PYTHON) $(PYSRC)/setup.py install_lib -b build --skip-build $(PYTHON_INSTALL_ARG) clean-local: diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index 19ef7e5f522..85d7195af3a 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -168,7 +168,7 @@ DESTRUCTOR(__wt_session, close) */ %header %{ -#include "../src/include/wt_internal.h" +#include "src/include/wt_internal.h" /* * Closed handle checking: |