From 41cd3011ac9761b110d5863aa24667701b3514cd Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Tue, 13 Nov 2007 20:16:59 -0700 Subject: [PATCH] setup: pass INCLUDE_DIRS and LIBRARY_DIRS variables, if any to setup.py from Makefile --- Makefile | 9 ++++++++- README | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9f78ad61..8105c623 100644 --- 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 7b79770d..094e102a 100644 --- 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/ -- 2.45.2