From 1d9d133cce90c54c22276499eafca9c911b25944 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 11 Apr 2002 21:01:10 +0000 Subject: [PATCH] Fixed installation/configuration checks [SVN r13451] --- python.jam | 2 ++ v1/python.jam | 2 ++ 2 files changed, 4 insertions(+) diff --git a/python.jam b/python.jam index a0b3dbe07..1d1fb0b01 100644 --- a/python.jam +++ b/python.jam @@ -27,6 +27,7 @@ if $(NT) PYTHON_ROOT ?= c:/tools/python ; PYTHON_LIB_PATH ?= $(PYTHON_ROOT)/libs $(PYTHON_ROOT)/PCBuild ; + PYTHON_STDLIB_PATH ?= $(PYTHON_ROOT)/Lib ; # Locate Python libraries. In the case of MSVC the libraries are # found implicitly, and GCC/MINGW will use -lpython to @@ -60,6 +61,7 @@ else if $(UNIX) PYTHON_ROOT ?= /usr/local ; PYTHON_INCLUDES ?= $(PYTHON_ROOT)/include/python$(PYTHON_VERSION) ; PYTHON_LIB_PATH ?= $(PYTHON_ROOT)/lib/python$(PYTHON_VERSION)/config ; + PYTHON_STDLIB_PATH ?= $(PYTHON_ROOT)/lib/python$(PYTHON_VERSION) ; PYTHON_PROPERTIES ?= $(PYTHON_INCLUDES) diff --git a/v1/python.jam b/v1/python.jam index a0b3dbe07..1d1fb0b01 100644 --- a/v1/python.jam +++ b/v1/python.jam @@ -27,6 +27,7 @@ if $(NT) PYTHON_ROOT ?= c:/tools/python ; PYTHON_LIB_PATH ?= $(PYTHON_ROOT)/libs $(PYTHON_ROOT)/PCBuild ; + PYTHON_STDLIB_PATH ?= $(PYTHON_ROOT)/Lib ; # Locate Python libraries. In the case of MSVC the libraries are # found implicitly, and GCC/MINGW will use -lpython to @@ -60,6 +61,7 @@ else if $(UNIX) PYTHON_ROOT ?= /usr/local ; PYTHON_INCLUDES ?= $(PYTHON_ROOT)/include/python$(PYTHON_VERSION) ; PYTHON_LIB_PATH ?= $(PYTHON_ROOT)/lib/python$(PYTHON_VERSION)/config ; + PYTHON_STDLIB_PATH ?= $(PYTHON_ROOT)/lib/python$(PYTHON_VERSION) ; PYTHON_PROPERTIES ?= $(PYTHON_INCLUDES)