simplify makefile, depend on node-pre-gyp tricks

mapnik · Apr 14, 2014 · cc754da · cc754da
1 parent 33208a4
commit cc754da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,14 @@
 
 all: mapnik.node
 
-mapnik.node:
-	PATH=$$PATH:`npm explore npm -g -- pwd`/bin/node-gyp-bin/ node-gyp build
+./node_modules/mapnik-vector-tile:
+	npm install mapnik-vector-tile sphericalmercator mocha
+
+./node_modules/.bin/node-pre-gyp: ./node_modules/mapnik-vector-tile
+	npm install node-pre-gyp
+
+mapnik.node: ./node_modules/.bin/node-pre-gyp
+	./node_modules/.bin/node-pre-gyp build
 
 clean:
 	@rm -rf ./build

diff --git a/binding.gyp b/binding.gyp
@@ -3,8 +3,6 @@
   'variables': {
       'std%':'ansi',
       'runtime_link%':'shared',
-      "module_name":"<!(node -e \"console.log(require('./package.json').binary.module_name)\")",
-      "module_path":"<!(node -e \"console.log(require('./package.json').binary.module_path)\")",
       'NODEMAPNIK_DIR%':'.'
   },
   'conditions': [

diff --git a/configure b/configure