Permalink
Browse files

Use node_modules/.bin for binaries.

  • Loading branch information...
mbostock committed Mar 11, 2013
1 parent b4c1e6c commit 43b649485b2f8752114bf5d2f44daeaba2eedcbc
Showing with 5 additions and 8 deletions.
  1. +3 −7 Makefile
  2. +2 −1 package.json
View
@@ -1,7 +1,3 @@
-NODE_PATH ?= ./node_modules
-JS_UGLIFY = uglifyjs
-JS_TESTER = $(NODE_PATH)/vows/bin/vows
-
all: \
d3.geo.projection.js \
d3.geo.projection.min.js
@@ -81,16 +77,16 @@ d3.geo.projection.js: \
geo/projection/end.js
test: all
- @$(JS_TESTER) $(shell find . -name "*-test.js" \! -path "./node_modules/*")
+ @node_modules/.bin/vows $(shell find . -name "*-test.js" \! -path "./node_modules/*")
%.min.js: %.js Makefile
@rm -f $@
- $(JS_UGLIFY) $< -c -m -o $@
+ node_modules/.bin/uglifyjs $< -c -m -o $@
d3%js: Makefile
@rm -f $@
@cat $(filter %.js,$^) > $@.tmp
- $(JS_UGLIFY) $@.tmp -b indent-level=2 -o $@
+ node_modules/.bin/uglifyjs $@.tmp -b indent-level=2 -o $@
@rm $@.tmp
@chmod a-w $@
View
@@ -12,9 +12,10 @@
"d3": "3.0.x"
},
"devDependencies": {
+ "uglify-js": "2.2.x",
"vows": "0.7.x"
},
"scripts": {
- "test": "./node_modules/vows/bin/vows `find . -name \"*-test.js\" \\! -path \"./node_modules/*\"`"
+ "test": "node_modules/.bin/vows `find . -name \"*-test.js\" \\! -path \"./node_modules/*\"`"
}
}

0 comments on commit 43b6494

Please sign in to comment.