lede-packages-rs

commit 301aa32de16cb6a176e9f496f31c89b80ba277f8
parent e8acdcdcdc4657f316b6cade7e973765ca276563
Author: John Crispin <john@phrozen.org>
Date:   Tue,  4 Oct 2016 09:12:03 +0200

Merge pull request #3293 from NeoRaider/node

node: use default host install prefix
Diffstat:
M
lang/node-arduino-firmata/Makefile
 | 
2
+-
M
lang/node-cylon/Makefile
 | 
2
+-
M
lang/node-hid/Makefile
 | 
2
+-
M
lang/node-serialport/Makefile
 | 
2
+-
M
lang/node/Makefile
 | 
2
+-

5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
@@ -54,7 +54,7 @@ define Build/Compile
 	npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
 	npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
 	PREFIX="$(PKG_INSTALL_DIR)/usr/" \
-	$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
+	npm install -g $(PKG_BUILD_DIR)
 endef
 
 define Package/node-arduino-firmata/install
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
@@ -69,7 +69,7 @@ define Build/Compile
 	npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
 	npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
 	PREFIX="$(PKG_INSTALL_DIR)/usr/" \
-	$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
+	npm install -g $(PKG_BUILD_DIR)
 endef
 
 define Package/node-cylon/install
diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile
@@ -53,7 +53,7 @@ define Build/Compile
 	npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
 	npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
 	PREFIX="$(PKG_INSTALL_DIR)/usr/" \
-	$(STAGING_DIR)/host/bin/npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
+	npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
 endef
 
 define Package/node-hid/install
diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile
@@ -53,7 +53,7 @@ define Build/Compile
 	npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
 	npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
 	PREFIX="$(PKG_INSTALL_DIR)/usr/" \
-	$(STAGING_DIR)/host/bin/npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
+	npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
 endef
 
 define Package/node-serialport/install
diff --git a/lang/node/Makefile b/lang/node/Makefile
@@ -61,7 +61,7 @@ HOST_CONFIGURE_VARS:=
 HOST_CONFIGURE_ARGS:= \
 	--dest-os=linux \
 	--without-snapshot \
-	--prefix=$(STAGING_DIR)/host/
+	--prefix=$(HOST_BUILD_PREFIX)
 
 HOST_CONFIGURE_CMD:=python ./configure