e9b3e44
commit 3134ffa7425ab147bf956734e538f888c545cc7d
2168be5
Author: Tom Hughes <tom@compton.nu>
2168be5
Date:   Mon Aug 18 14:30:51 2014 +0100
2168be5
2168be5
    Patch out use of node-pre-gyp
2168be5
eaef427
diff --git a/bin/mapnik-index.js b/bin/mapnik-index.js
f6b04af
index ec1f249..0e18ada 100755
eaef427
--- a/bin/mapnik-index.js
eaef427
+++ b/bin/mapnik-index.js
eaef427
@@ -2,9 +2,8 @@
eaef427
 
eaef427
 'use strict';
eaef427
 
eaef427
-var binary = require('node-pre-gyp'),
eaef427
-    path = require('path'),
eaef427
-    bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
eaef427
+var path = require('path'),
eaef427
+    bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
f6b04af
     program = path.join(path.dirname(bindingPath), 'bin', 'mapnik-index'),
eaef427
     spawn = require('child_process').spawn,
eaef427
     fs = require('fs');
eaef427
diff --git a/bin/mapnik-shapeindex.js b/bin/mapnik-shapeindex.js
f6b04af
index 50b533d..0d73b7f 100755
eaef427
--- a/bin/mapnik-shapeindex.js
eaef427
+++ b/bin/mapnik-shapeindex.js
eaef427
@@ -2,9 +2,8 @@
eaef427
 
eaef427
 'use strict';
eaef427
 
eaef427
-var binary = require('node-pre-gyp'),
eaef427
-    path = require('path'),
eaef427
-    bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
eaef427
+var path = require('path'),
eaef427
+    bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
f6b04af
     shapeindex = path.join(path.dirname(bindingPath), 'bin', 'shapeindex'),
eaef427
     spawn = require('child_process').spawn,
eaef427
     fs = require('fs');
2168be5
diff --git a/lib/mapnik.js b/lib/mapnik.js
824147d
index 4cbb721..ef64c92 100644
2168be5
--- a/lib/mapnik.js
2168be5
+++ b/lib/mapnik.js
eaef427
@@ -1,9 +1,8 @@
eaef427
 "use strict";
eaef427
 
2168be5
-var binary = require('node-pre-gyp');
eaef427
 var exists = require('fs').existsSync || require('path').existsSync;
2168be5
 var path = require('path');
2168be5
-var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
2168be5
+var binding_path = path.resolve(path.join(__dirname,'binding/mapnik.node'));
2168be5
 var settings_path = path.join(path.dirname(binding_path),'mapnik_settings.js');
2168be5
 var settings = require(settings_path);
2168be5
 
7ae92d3
diff --git a/package.json b/package.json
e9b3e44
index 522ce65..21d49bd 100644
7ae92d3
--- a/package.json
7ae92d3
+++ b/package.json
f6b04af
@@ -38,8 +38,7 @@
7ae92d3
   "dependencies": {
e9b3e44
     "mapnik-vector-tile": "1.4.0",
f6b04af
     "protozero": "1.5.1",
f6b04af
-    "nan": "~2.5.0",
f6b04af
-    "node-pre-gyp": "~0.6.30"
f6b04af
+    "nan": "~2.5.0"
7ae92d3
   },
f6b04af
   "bundledDependencies": [
f6b04af
       "node-pre-gyp"