From 087add2c7174bd17b7626d5f4f15575293930f9b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 16 Mar 2016 13:48:26 -0700 Subject: [PATCH] Remove MAPNIK_BUNDLED_SHARE_DIRECTORY build option - this was intended to be used by python-mapnik - but it is not currently, so let's clean it up - todo: get actual ICU_DATA,PROJ_LIB,GDAL_DATA values from those depependent libs --- SConstruct | 1 - utils/mapnik-config/build.py | 5 ----- 2 files changed, 6 deletions(-) diff --git a/SConstruct b/SConstruct index 06e02617c..dacc950f8 100644 --- a/SConstruct +++ b/SConstruct @@ -319,7 +319,6 @@ opts.AddVariables( ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths (create multiple excludes separated by :)', ''), ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''), ('MAPNIK_NAME', 'Name of library', 'mapnik'), - BoolVariable('MAPNIK_BUNDLED_SHARE_DIRECTORY', 'For portable packaging: instruct mapnik-config to report relative paths to bundled GDAL_DATA, PROJ_LIB, and ICU_DATA','False'), # Boost variables # default is '/usr/include', see FindBoost method below diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py index bf3e5b304..e4178ba41 100644 --- a/utils/mapnik-config/build.py +++ b/utils/mapnik-config/build.py @@ -131,11 +131,6 @@ mapnik_bundled_gdal_data = '' mapnik_bundled_proj_data = '' mapnik_bundled_icu_data = '' -if config_env.get('MAPNIK_BUNDLED_SHARE_DIRECTORY'): - mapnik_bundled_gdal_data = 'lib/mapnik/share/gdal' - mapnik_bundled_proj_data = 'lib/mapnik/share/proj' - mapnik_bundled_icu_data = 'lib/mapnik/share/icu' - configuration = { "git_revision": git_revision, "git_describe": git_describe,