From 98a145acd0f30a511426589077a893c97890d04b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 23 Jan 2013 21:58:04 -0800 Subject: [PATCH] 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) --- utils/mapnik-config/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py index 55fdd5dba..73ffc66d5 100644 --- a/utils/mapnik-config/build.py +++ b/utils/mapnik-config/build.py @@ -17,7 +17,7 @@ config_variables = '''#!/bin/sh ## variables -CONFIG_PREFIX=%(prefix)s +CONFIG_PREFIX="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ))" && pwd )" CONFIG_MAPNIK_LIBNAME=%(mapnik_libname)s CONFIG_MAPNIK_INCLUDE=${CONFIG_PREFIX}/include CONFIG_MAPNIK_LIB=${CONFIG_PREFIX}/%(libdir_schema)s @@ -74,7 +74,6 @@ else: git_revision = stdin.strip() configuration = { - "prefix": config_env['PREFIX'], "mapnik_libname": 'mapnik', "libdir_schema": config_env['LIBDIR_SCHEMA'], "ldflags": ldflags,