commit 5a92e2b4dd4bbe1637c49489d7d09003af3324a9
author Cosmos Nicolaou <cnicolaou@google.com> Fri Oct 09 20:29:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 09 20:29:45 2015 +0000
tree 06174d40e71470a992ee874aa1e47f881e810e13
parent 9961eb0877c764357e29cf3dcc84bfa8973786cf
parent e8ce3024bbcb29cbb8ef09713d13f212c19a87a1

Merge "v.io/jiri: continue to tidy-up and convert to new-style profiles."

Makefile

diff --git a/Makefile b/Makefile
index 1901f2f..37cecb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-PATH := node_modules/.bin:${JIRI_ROOT}/third_party/cout/node/bin:$(PATH)
+NODE_DIR := $(shell jiri v23-profile env --profile=nodejs V23_TARGET_INSTALLATION_DIR|sed -e 's/V23_TARGET_INSTALLATION_DIR=//' -e 's/"//g')
+PATH := node_modules/.bin:$(NODE_DIR)/bin:$(PATH)
 
 NODE_BIN := $(JIRI_ROOT)/release/javascript/core/node_modules/.bin
 GOPATH := $(JIRI_ROOT)/release/javascript/core/go
@@ -316,7 +317,7 @@
 node_modules: package.json  check-that-npm-is-in-path
 ifndef NONPMUPDATE
 	@npm prune
-	@npm install --quiet || (rm -fr $(HOME)/.npm && npm install --quiet) 
+	@npm install --quiet || (rm -fr $(HOME)/.npm && npm install --quiet)
 	@touch node_modules
 endif