From 9b5abcd48c3f2277c8c328ff7d2db26b272618c5 Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Sat, 17 Mar 2001 16:56:35 +0000 Subject: [PATCH] Tidy up the ordering of include and library directories, putting /usr/local first and leaving /usr/include at the end. This addresses the comments in bug #232609. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 88e1c63486c..61c4fad1022 100644 --- a/setup.py +++ b/setup.py @@ -146,19 +146,19 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used if '/usr/local/lib' not in self.compiler.library_dirs: - self.compiler.library_dirs.append('/usr/local/lib') + self.compiler.library_dirs.insert(0, '/usr/local/lib') if '/usr/local/include' not in self.compiler.include_dirs: - self.compiler.include_dirs.append( '/usr/local/include' ) + self.compiler.include_dirs.insert(0, '/usr/local/include' ) # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib'] - inc_dirs = ['/usr/include'] + self.compiler.include_dirs + inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] platform = self.get_platform() - + # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] if platform in ['Darwin1.2', 'beos']: