commit 00a007014b80dc7df054626ef4d200594c9a2e7a Author: Tom Hughes Date: Sat Sep 10 12:00:00 2016 +0100 Build against system libraries diff --git a/bin/mapnik-index.js b/bin/mapnik-index.js index 0e18ada5..04430dcc 100755 --- a/bin/mapnik-index.js +++ b/bin/mapnik-index.js @@ -3,7 +3,7 @@ 'use strict'; var path = require('path'), - bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')), + bindingPath = path.resolve(path.join(__dirname, '..', 'lib', 'binding', 'mapnik.node')), program = path.join(path.dirname(bindingPath), 'bin', 'mapnik-index'), spawn = require('child_process').spawn, fs = require('fs'); diff --git a/bin/mapnik-shapeindex.js b/bin/mapnik-shapeindex.js index 0d73b7f8..d4fed9f2 100755 --- a/bin/mapnik-shapeindex.js +++ b/bin/mapnik-shapeindex.js @@ -3,7 +3,7 @@ 'use strict'; var path = require('path'), - bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')), + bindingPath = path.resolve(path.join(__dirname, '..', 'lib', 'binding', 'mapnik.node')), shapeindex = path.join(path.dirname(bindingPath), 'bin', 'shapeindex'), spawn = require('child_process').spawn, fs = require('fs'); diff --git a/binding.gyp b/binding.gyp index 6bdf3b18..79cfa70b 100644 --- a/binding.gyp +++ b/binding.gyp @@ -34,16 +34,8 @@ 4267 ], 'include_dirs': [ - './mason_packages/.link/include/', - './mason_packages/.link/include/freetype2', - './mason_packages/.link/include/cairo', './src', "