From 86e2fb3f31bc2404fcd0e063d6c241ad6149a09a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 16 Nov 2010 23:50:51 +0000 Subject: [PATCH] actually catch the SYSTEM_FONTS variable this time --- utils/mapnik-config/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/mapnik-config/SConscript b/utils/mapnik-config/SConscript index e02436644..1e4c101e1 100644 --- a/utils/mapnik-config/SConscript +++ b/utils/mapnik-config/SConscript @@ -29,7 +29,10 @@ LIBDIR_SCHEMA = env['LIBDIR_SCHEMA'] version = env['MAPNIK_VERSION_STRING'] mapnik_libname = 'mapnik2' input_plugins = os.path.normpath(env['DESTDIR'] + '/' + env['PREFIX'] + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME']) -fonts = os.path.normpath(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/fonts') +if env['SYSTEM_FONTS']: + fonts = osm.path.normpath(env['SYSTEM_FONTS']) +else: + fonts = os.path.normpath(install_prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'] + '/fonts') filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']