setup: pass INCLUDE_DIRS and LIBRARY_DIRS variables, if any to setup.py from Makefile

diff --git a/Makefile b/Makefile
index 9f78ad618cfd498b96a739f1b875850ce9e42cb6..8105c62315ac3a6e054a2de3401b8694d0203d17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,13 @@ OSSEP=$(shell python -c 'import os ; print os.sep')
 
 REACTOR=
 
+ifneq ($(INCLUDE_DIRS),)
+INCLUDE_DIRS_ARG = -I$(INCLUDE_DIRS)
+endif
+ifneq ($(LIBRARY_DIRS),)
+LIBRARY_DIRS_ARG = -L$(LIBRARY_DIRS)
+endif
+
 PLAT = $(strip $(shell python -c "import sys ; print sys.platform"))
 ifeq ($(PLAT),win32)
  # The platform is Windows with cygwin build tools and the native Python interpreter.
@@ -67,7 +74,7 @@ make-version:
        touch .built
 
 build: 
-       $(PYTHON) ./setup.py build_ext -i
+       $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG)
        chmod +x bin/tahoe
 
 # 'make install' will do the following:

diff --git a/README b/README
index 7b79770df5090a3943aa07eab0af53a769405a64..094e102a8aa566856d5cbf171d0bf574f963d211 100644 (file)
--- a/README
+++ b/README
@@ -52,7 +52,7 @@ The Manual Dependencies:
  + GNU make (build tool)
 
  + Python 2.4 or newer (tested against 2.4, and 2.5.1), including
-   development headers (language)
+   development headers i.e. "Python.h" (language)
 
    http://python.org/