author | Alberto Bertogli
<albertito@blitiri.com.ar> 2009-06-26 04:30:34 UTC |
committer | Alberto Bertogli
<albertito@blitiri.com.ar> 2009-06-26 04:31:21 UTC |
parent | d701482999b81aff8f0e0e1c7b10e96bc1811af7 |
Makefile | +2 | -2 |
bindings/python/setup.py | +7 | -1 |
diff --git a/Makefile b/Makefile index a810bc8..c5c046d 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,13 @@ install: $(MAKE) -C libjio/ install -python2: +python2: libjio cd bindings/python && python setup.py build python2_install: python2 cd bindings/python && python setup.py install -python3: +python3: libjio cd bindings/python && python3 setup.py build python3_install: python3 diff --git a/bindings/python/setup.py b/bindings/python/setup.py index ec0c8c5..446fd5a 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -10,7 +10,13 @@ elif sys.version_info[0] == 3: libjio = Extension("libjio", libraries = ['jio'], sources = ['libjio.c'], - define_macros = [ver_define] ) + define_macros = [ver_define], + + # these two allow us to build without having libjio installed, + # assuming we're in the libjio source tree + include_dirs = ['../../libjio/'], + library_dirs=['../../libjio/'] + ) setup( name = 'libjio',