summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-08-04 17:21:37 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-08-04 17:21:37 +0200
commit9f1ae2a545514dfe6a38bf072106b92d9f21d09f (patch)
tree9236f2a2d099e646f31fec588f053ee5984815cb /js
parentf4612a396cb3744b07433b870f7e3d176b083ad8 (diff)
dont install phantomjs from npm
Diffstat (limited to 'js')
-rw-r--r--js/Makefile2
-rw-r--r--js/package.json1
2 files changed, 1 insertions, 2 deletions
diff --git a/js/Makefile b/js/Makefile
index f9cf87dec..4dd1a16e9 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -20,7 +20,7 @@ firefox_bin=/usr/bin/firefox
chrome_bin=/usr/bin/chromium
coffee=$(CURDIR)/node_modules/coffee-script/bin/coffee
grunt=$(CURDIR)/node_modules/grunt-cli/bin/grunt
-phantomjs=$(CURDIR)/node_modules/phantomjs/bin/phantomjs
+phantomjs=/usr/bin/phantomjs
all: compile
diff --git a/js/package.json b/js/package.json
index 9c7bf2dda..0677f0e31 100644
--- a/js/package.json
+++ b/js/package.json
@@ -24,7 +24,6 @@
"grunt-coffeelint": "*",
"grunt-karma": "*",
"grunt-wrap": "*",
- "phantomjs": "*",
"grunt-phpunit": "*"
},
"engine": "node >= 0.8"