From 03285f60b0b5fb92b289fad9046a253874e776cd Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 14 Jan 2016 14:09:32 -0800
Subject: [PATCH] install mapbox variant - followup to #3236

---
 deps/mapnik/build.py         | 11 ++++++-----
 utils/mapnik-config/build.py |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/deps/mapnik/build.py b/deps/mapnik/build.py
index 32afe1189..0d6dc8486 100644
--- a/deps/mapnik/build.py
+++ b/deps/mapnik/build.py
@@ -4,14 +4,15 @@ from glob import glob
 Import('env')
 
 subdirs =  {
-  'sparsehash':'sparsehash',
-  'sparsehash/internal':'sparsehash/internal',
-  '../agg/include':'agg',
+  './sparsehash':{'dir':'sparsehash','glob':'*'},
+  './sparsehash/internal':{'dir':'sparsehash/internal','glob':'*'},
+  '../agg/include':{'dir':'agg','glob':'agg*'},
+  '../mapbox':{'dir':'mapbox/variant','glob':'*/*.hpp'}
 }
 
 if 'install' in COMMAND_LINE_TARGETS:
     for k,v in subdirs.items():
-        pathdir = os.path.join(k,'*')
+        pathdir = os.path.join(k,v['glob'])
         includes = glob(pathdir)
-        inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+v)
+        inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+v['dir'])
         env.Alias(target='install', source=env.Install(inc_target, includes))
diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py
index e74684e62..bf3e5b304 100644
--- a/utils/mapnik-config/build.py
+++ b/utils/mapnik-config/build.py
@@ -63,7 +63,7 @@ CONFIG_MAPNIK_LIBNAME='%(mapnik_libname)s'
 CONFIG_MAPNIK_LIBPATH="%(mapnik_libpath)s"
 CONFIG_DEP_LIBS='%(dep_libs)s'
 CONFIG_MAPNIK_LDFLAGS="%(ldflags)s"
-CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg"
+CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg -I${CONFIG_PREFIX}/include/mapnik"
 CONFIG_DEP_INCLUDES="%(dep_includes)s"
 CONFIG_CXXFLAGS="%(cxxflags)s"
 CONFIG_CXX='%(cxx)s'