at master 1.2 kB view raw
1diff --git a/build.py b/build.py 2index 0f94826b6..3cceb4546 100644 3--- a/build.py 4+++ b/build.py 5@@ -110,8 +110,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt') 6 _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so') 7 8 Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) 9-Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}')) 10-Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}')) 11+Depends(_mapnik, env.subst('@libmapnik@/libmapnikjson${LIBSUFFIX}')) 12+Depends(_mapnik, env.subst('@libmapnik@/libmapnikwkt${LIBSUFFIX}')) 13 14 if 'uninstall' not in COMMAND_LINE_TARGETS: 15 pymapniklib = env.Install(target_path,_mapnik) 16diff --git a/setup.py b/setup.py 17index 9985da5a2..5a03a1ec8 100755 18--- a/setup.py 19+++ b/setup.py 20@@ -118,8 +118,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' ')) 21 linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' ')) 22 linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' ')) 23 linkflags.extend([ 24-'-lmapnik-wkt', 25-'-lmapnik-json', 26+'-lmapnikwkt', 27+'-lmapnikjson', 28 ] + ['-l%s' % i for i in get_boost_library_names()]) 29 30 # Dynamically make the mapnik/paths.py file