1 --- Python-2.4.2-001/setup.py 2007-01-23 16:18:37.000000000 +0100
2 +++ Python-2.4.2/setup.py 2007-01-23 16:26:43.000000000 +0100
6 def detect_modules(self):
7 - # Ensure that /usr/local is always used
9 + modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()
11 + modules_include_dirs = ['/usr/include']
13 + modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split()
15 + modules_lib_dirs = ['/usr/lib']
16 + for dir in modules_include_dirs:
17 + add_dir_to_list(self.compiler.include_dirs, dir)
18 + for dir in modules_lib_dirs:
19 + add_dir_to_list(self.compiler.library_dirs, dir)
21 # Add paths to popular package managers on OS X/darwin
22 if sys.platform == "darwin":
24 # lib_dirs and inc_dirs are used to search for files;
25 # if a file is found in one of those directories, it can
26 # be assumed that no additional -I,-L directives are needed.
27 - lib_dirs = self.compiler.library_dirs + [
28 - '/lib64', '/usr/lib64',
31 - inc_dirs = self.compiler.include_dirs + ['/usr/include']
32 + lib_dirs = self.compiler.library_dirs
33 + inc_dirs = self.compiler.include_dirs
36 platform = self.get_platform()