From 805664056a643aac9b3e885ce0a7e10e035e0c85 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 10 Jan 2013 17:08:58 -0800 Subject: [PATCH] append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority --- src/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build.py b/src/build.py index 06251e637..ec9d707e3 100644 --- a/src/build.py +++ b/src/build.py @@ -198,11 +198,11 @@ source = Split( ) if env['HAS_CAIRO']: - lib_env.PrependUnique(LIBPATH=env['CAIRO_LIBPATHS']) + lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS']) lib_env.Append(LIBS=env['CAIRO_LINKFLAGS']) lib_env.Append(CXXFLAGS = '-DHAVE_CAIRO') libmapnik_cxxflags.append('-DHAVE_CAIRO') - lib_env.PrependUnique(CPPPATH=copy(env['CAIRO_CPPPATHS'])) + lib_env.AppendUnique(CPPPATH=copy(env['CAIRO_CPPPATHS'])) source.insert(0,'cairo_renderer.cpp') source.insert(0,'cairo_context.cpp')