Commit 1325da4a authored by Martin Bark's avatar Martin Bark Committed by Thomas Petazzoni
Browse files

package/nodejs: Fixed npm global install 

Set npm_config_prefix to $(TARGET_DIR)/usr so that npm -g will correctly
install global modules to $(TARGET_DIR)/usr/lib/node_modules.

By using npm -g to install global modules npm will now automatically create
the symlinks to executables under $(TARGET_DIR)/usr/bin.

See https://docs.npmjs.com/misc/config#global and
https://docs.npmjs.com/files/folders

 for information on how the prefix
setting is used by global installs.

Signed-off-by: default avatarMartin Bark <martin@barkynet.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c2dd6cd2

package/nodejs/nodejs.mk

+2 −11
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ NPM = $(TARGET_CONFIGURE_OPTS) \ 
	npm_config_target_arch=$(NODEJS_CPU) \

	npm_config_build_from_source=true \

	npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \

	npm_config_prefix=$(TARGET_DIR)/usr \

	$(HOST_DIR)/usr/bin/npm



#
@@ -116,17 +117,7 @@ define NODEJS_INSTALL_MODULES 
	# If you're having trouble with module installation, adding -d to the

	# npm install call below and setting npm_config_rollback=false can both

	# help in diagnosing the problem.

	(cd $(TARGET_DIR)/usr/lib && mkdir -p node_modules && \

		$(NPM) install $(NODEJS_MODULES_LIST) \

	)



	# Symlink all executables in $(TARGET_DIR)/usr/lib/node_modules/.bin to

	# $(TARGET_DIR)/usr/bin so they are accessible from the command line

	cd $(TARGET_DIR)/usr/bin; \

	for f in ../../usr/lib/node_modules/.bin/*; do \

		[ -f "$${f}" -a -x "$${f}" ] || continue; \

		ln -sf "$${f}" "$${f##*/}" || exit 1; \

	done

	$(NPM) install -g $(NODEJS_MODULES_LIST)

endef

endif