From: Matthias Schiffer Date: Tue, 4 Oct 2016 02:57:54 +0000 (+0200) Subject: node: use default host install prefix X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=0da71b8f8591f2f2eb9e931749fcfdaef58a3bf2;p=feed%2Fpackages.git node: use default host install prefix Signed-off-by: Matthias Schiffer --- diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile index 209c68403c..f4de0c0c4d 100644 --- 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 index 272c8fbfb8..13833a3552 100644 --- 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 index 2b6031aa65..b8a5b7ab9d 100644 --- 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 index 09e66219b5..3109404921 100644 --- 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 index 4f9aa79605..51ed57fe5c 100644 --- 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