sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid hardcoding prefix that mapnik-config knows about and rather determine on the fly based on where it is installed (helps with package building and should be harmless otherwise)

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-23 21:58:04 -08:00
parent c5837ea2b7
commit 98a145acd0
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
utils/mapnik-config/build.py
View file

@ -17,7 +17,7 @@ config_variables = '''#!/bin/sh
## variables ## variables
CONFIG_PREFIX=%(prefix)s CONFIG_PREFIX="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ))" && pwd )"
CONFIG_MAPNIK_LIBNAME=%(mapnik_libname)s CONFIG_MAPNIK_LIBNAME=%(mapnik_libname)s
CONFIG_MAPNIK_INCLUDE=${CONFIG_PREFIX}/include CONFIG_MAPNIK_INCLUDE=${CONFIG_PREFIX}/include
CONFIG_MAPNIK_LIB=${CONFIG_PREFIX}/%(libdir_schema)s CONFIG_MAPNIK_LIB=${CONFIG_PREFIX}/%(libdir_schema)s
@ -74,7 +74,6 @@ else:
git_revision = stdin.strip() git_revision = stdin.strip()
configuration = { configuration = {
"prefix": config_env['PREFIX'],
"mapnik_libname": 'mapnik', "mapnik_libname": 'mapnik',
"libdir_schema": config_env['LIBDIR_SCHEMA'], "libdir_schema": config_env['LIBDIR_SCHEMA'],
"ldflags": ldflags, "ldflags": ldflags,