node: use default host install prefix 3293/head
authorMatthias Schiffer <mschiffer@universe-factory.net>
Tue, 4 Oct 2016 02:57:54 +0000 (04:57 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Tue, 4 Oct 2016 03:02:09 +0000 (05:02 +0200)
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
lang/node-arduino-firmata/Makefile
lang/node-cylon/Makefile
lang/node-hid/Makefile
lang/node-serialport/Makefile
lang/node/Makefile

index 209c68403c5cfb1e84cb8b86120ff957742574e1..f4de0c0c4dbd52913f9421ea451cf6283c50dfb5 100644 (file)
@@ -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
index 272c8fbfb83941f8b5adaf3723fd33136520ce1a..13833a3552c3e6221e821dcc2b0680fc34f5b425 100644 (file)
@@ -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
index 2b6031aa654e01b27a2a5d9958f4158163cd5e61..b8a5b7ab9ddab29468779497cfd706184d7bc963 100644 (file)
@@ -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
index 09e66219b55a1a9b59ced9956f4a10f70a2204bb..3109404921e796cf203a0725f4210b656cf7b1e4 100644 (file)
@@ -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
index 4f9aa7960567252470b20ba8348dd854355f9e36..51ed57fe5c9f2264ca87d79efb973b29303dd418 100644 (file)
@@ -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