# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2017-05-28 08:50:56
# Node ID 9be85c08a69fbee95218a8841691ad8617a093cc
# Parent  9bfd2303f01198e88bb5d64f64fbf8144f7e15e7

fix bower and npm builds
Ignore-this: 1867ee8b2ba4b883c89a7f6bd5ab446a

diff --git a/makefile b/makefile
--- a/makefile
+++ b/makefile
@@ -73,10 +73,17 @@ gst_packages:
 packages:
 	sudo aptitude install coffeescript normalize-audio audacity python-pygame libffi-dev tix libzmq3-dev python-dev libssl-dev python-opencv python-cairo
 
-bower:
-	cd light9/web/lib; bower install
-	cd light9/web/lib/N3.js; npm install; npm run browser
-	cd light9/web/lib/d3; npm install
+
+node_modules/bower/bin/bower:
+	npm install
+
+bin/node:
+	ln -sf `which nodejs` bin/node
+
+bower: node_modules/bower/bin/bower bin/node
+	cd light9/web/lib; nodejs ../../../node_modules/bower/bin/bower install
+	cd light9/web/lib/N3.js; npm install; PATH=../../../../bin:$(PATH) npm run browser
+	cd light9/web/lib/d3; PATH=../../../../bin:$(PATH) npm install
 
 raspberry_pi_packages:
 	sudo apt-get install python-picamera python-dev python-twisted python-virtualenv
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "test": "test"
   },
   "dependencies": {
+    "bower": "^1.8.0",
     "chai": "^3.5.0",
     "mocha": "^2.5.3"
   },